diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-01 00:58:45 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-01 00:58:45 +0000 |
| commit | 14899b0c8c74510eae4f488c5a10a851153d5ab0 (patch) | |
| tree | 299dfe4ea0b98e9506330f445a2a96c83436fdef | |
| parent | 717c2fe689fffcebf449fb55d01701cffd8c0149 (diff) | |
| download | ATCD-14899b0c8c74510eae4f488c5a10a851153d5ab0.tar.gz | |
ChangeLogTag: Tue Nov 30 16:38:08 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | apps/gperf/tests/Makefile.am | 16 |
2 files changed, 9 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index fa8d38dc867..509c5258837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 30 16:38:08 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * apps/gperf/tests/Makefile.am: + + Changed to only generate idl.cpp from idl.gperf once. The + attempt to generate it twice, the a second time in a different + directory failed because the "stamp" file was the same. + Tue Nov 30 17:32:29 2004 Steve Huston <shuston@riverace.com> * m4/ace.m4: Added two new options, --enable-pthreads and diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am index 47c5da6b564..d2d65dbde5a 100644 --- a/apps/gperf/tests/Makefile.am +++ b/apps/gperf/tests/Makefile.am @@ -146,20 +146,6 @@ endif !BUILD_USES_WCHAR if !BUILD_USES_WCHAR -BUILT_SOURCES += \ - iout2_gen/idl.cpp - -CLEANFILES += \ - iout2_gen/idl.cpp \ - idl-stamp - -iout2_gen/idl.cpp: idl-stamp - -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 = \ @@ -167,7 +153,7 @@ iout2_CPPFLAGS = \ -I$(ACE_BUILDDIR) iout2_SOURCES = \ - iout2_gen/idl.cpp \ + idl.cpp \ test.cpp iout2_LDADD = \ |