diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | apps/gperf/tests/Makefile.am | 81 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 33 insertions, 61 deletions
diff --git a/ChangeLog b/ChangeLog index d99c73dd1cb..2979d7dcbf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Nov 13 10:40:13 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Removed line with m4_include([configure.ac.Makefiles]), + autoreconf barfs with it present, even though it was + "commented out" with dnl... + + * apps/gperf/tests/Makefile.am: + + Tweak to work around MPC brokenness. + Fri Nov 12 20:54:14 2004 J.T. Conklin <jtc@acorntoolworks.com> * Makefile.am: diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am index 6f350b62400..693d6fd36fe 100644 --- a/apps/gperf/tests/Makefile.am +++ b/apps/gperf/tests/Makefile.am @@ -14,6 +14,7 @@ ACE_ROOT = $(top_srcdir) noinst_PROGRAMS = CLEANFILES = BUILT_SOURCES = + ## Makefile.adainset.am if !BUILD_USES_WCHAR @@ -22,14 +23,10 @@ BUILT_SOURCES += \ ada.cpp CLEANFILES += \ - ada.cpp \ - ada-stamp - -ada.cpp: ada-stamp + ada.cpp -ada-stamp: $(srcdir)/ada.gperf +ada.cpp: $(srcdir)/ada.gperf ../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf> $@ - @touch $@ noinst_PROGRAMS += aout @@ -54,14 +51,10 @@ BUILT_SOURCES += \ c.cpp CLEANFILES += \ - c.cpp \ - c-stamp - -c.cpp: c-stamp + c.cpp -c-stamp: $(srcdir)/c.gperf +c.cpp: $(srcdir)/c.gperf ../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf> $@ - @touch $@ noinst_PROGRAMS += cout @@ -86,14 +79,10 @@ BUILT_SOURCES += \ cpp.cpp CLEANFILES += \ - cpp.cpp \ - cpp-stamp - -cpp.cpp: cpp-stamp + cpp.cpp -cpp-stamp: $(srcdir)/cpp.gperf +cpp.cpp: $(srcdir)/cpp.gperf ../src/gperf -a -D $(srcdir)/cpp.gperf> $@ - @touch $@ noinst_PROGRAMS += cppout @@ -118,14 +107,10 @@ BUILT_SOURCES += \ idl.cpp CLEANFILES += \ - idl.cpp \ - idl-stamp - -idl.cpp: idl-stamp + idl.cpp -idl-stamp: $(srcdir)/idl.gperf +idl.cpp: $(srcdir)/idl.gperf ../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf> $@ - @touch $@ noinst_PROGRAMS += iout @@ -150,14 +135,10 @@ BUILT_SOURCES += \ idl.cpp CLEANFILES += \ - idl.cpp \ - idl-stamp - -idl.cpp: idl-stamp + idl.cpp -idl-stamp: $(srcdir)/idl.gperf +idl.cpp: $(srcdir)/idl.gperf ../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf> $@ - @touch $@ noinst_PROGRAMS += iout2 @@ -182,14 +163,10 @@ BUILT_SOURCES += \ modula3.cpp CLEANFILES += \ - modula3.cpp \ - modula3-stamp - -modula3.cpp: modula3-stamp + modula3.cpp -modula3-stamp: $(srcdir)/modula3.gperf +modula3.cpp: $(srcdir)/modula3.gperf ../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf> $@ - @touch $@ noinst_PROGRAMS += m3out @@ -214,14 +191,10 @@ BUILT_SOURCES += \ pascal.cpp CLEANFILES += \ - pascal.cpp \ - pascal-stamp - -pascal.cpp: pascal-stamp + pascal.cpp -pascal-stamp: $(srcdir)/pascal.gperf +pascal.cpp: $(srcdir)/pascal.gperf ../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf> $@ - @touch $@ noinst_PROGRAMS += pout @@ -246,14 +219,10 @@ BUILT_SOURCES += \ adadefs.cpp CLEANFILES += \ - adadefs.cpp \ - adadefs-stamp - -adadefs.cpp: adadefs-stamp + adadefs.cpp -adadefs-stamp: $(srcdir)/adadefs.gperf +adadefs.cpp: $(srcdir)/adadefs.gperf ../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf> $@ - @touch $@ noinst_PROGRAMS += preout @@ -278,14 +247,10 @@ BUILT_SOURCES += \ tao.cpp CLEANFILES += \ - tao.cpp \ - tao-stamp - -tao.cpp: tao-stamp + tao.cpp -tao-stamp: $(srcdir)/tao.gperf +tao.cpp: $(srcdir)/tao.gperf ../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf> $@ - @touch $@ noinst_PROGRAMS += taoout @@ -310,14 +275,10 @@ BUILT_SOURCES += \ corba.cpp CLEANFILES += \ - corba.cpp \ - corba-stamp - -corba.cpp: corba-stamp + corba.cpp -corba-stamp: $(srcdir)/corba.gperf +corba.cpp: $(srcdir)/corba.gperf ../src/gperf -a -o $(srcdir)/corba.gperf> $@ - @touch $@ noinst_PROGRAMS += tout diff --git a/configure.ac b/configure.ac index 906e14f174e..98d27a672b4 100644 --- a/configure.ac +++ b/configure.ac @@ -7466,7 +7466,6 @@ AC_CONFIG_FILES([ Kokyu/tests/EDF/Makefile Kokyu/tests/FIFO/Makefile ]) -dnl (when using MPC) m4_include([configure.ac.Makefiles]) dnl Configure subdirectories if they are present. AM_CONDITIONAL([BUILD_KOKYU], |