summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-02 19:14:45 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-12-02 19:14:45 +0000
commit3aa9bf7e699f0e20307758589c54984646493aa2 (patch)
tree0cd7cd3f529037cefb4aa48db7c3d312c8904d3d
parent47fb4e35f1385c1457ea025419c3c90fbcab86fd (diff)
downloadATCD-3aa9bf7e699f0e20307758589c54984646493aa2.tar.gz
ChangeLogTag: Thu Dec 2 11:09:07 2004 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog9
-rw-r--r--apps/gperf/tests/Makefile.am16
2 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 31c1738a4fb..d51c60b7c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Dec 2 11:09:07 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * apps/gperf/tests/Makefile.am:
+
+ Revert my previous change. Fixed orignal problem by putting the
+ stamp file in the same directory as the output file. Thanks to
+ Chad Elliott for letting me know that the gperf options for the
+ two invocations of gperf on idl.gperf were different.
+
Thu Dec 2 16:42:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
* include/makeinclude/platform_vxworks5.5.x.GNU:
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index d2d65dbde5a..982ec71244e 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -146,6 +146,20 @@ endif !BUILD_USES_WCHAR
if !BUILD_USES_WCHAR
+BUILT_SOURCES += \
+ iout2_gen/idl.cpp
+
+CLEANFILES += \
+ iout2_gen/idl.cpp \
+ iout2_gen/idl-stamp
+
+iout2_gen/idl.cpp: iout2_gen/idl-stamp
+
+iout2_gen/idl-stamp: $(srcdir)/idl.gperf
+ mkdir -p iout2_gen
+ ../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp
+ @touch $@
+
noinst_PROGRAMS += iout2
iout2_CPPFLAGS = \
@@ -153,7 +167,7 @@ iout2_CPPFLAGS = \
-I$(ACE_BUILDDIR)
iout2_SOURCES = \
- idl.cpp \
+ iout2_gen/idl.cpp \
test.cpp
iout2_LDADD = \