Fix libtest dependencies.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90439ad6358b2e8686e16b90baaf4822bfc4c659..f12bc0ad9a3cc8e97cf150c890b82d4b7fba0130 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@
 # There is NO WARRANTY, to the extent permitted by law.
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = nostdinc
 
 # For Gnulib
 MOSTLYCLEANFILES =
@@ -13,7 +12,6 @@ noinst_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
        -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-       -I$(top_builddir) -I$(top_srcdir) \
        -I$(top_builddir)/test \
        -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
        -DLOCALEDIR=\"$(localedir)\"
@@ -35,7 +33,7 @@ EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/validtypes.sed \
 dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = conf_post.h src/typemap.h src/output.h src/scan.h \
+noinst_HEADERS = conf_pre.h conf_post.h src/typemap.h src/output.h src/scan.h \
        src/parse.h src/i18n.h src/normalize.h src/error.h test/declgen.h \
        test/test.h
 
@@ -56,6 +54,7 @@ check_PROGRAMS =
 check_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(GSL_LIBS)
 libtest_la_SOURCES = test/testlib.c
+$(libtest_la_OBJECTS): $(gnulib_headers)
 
 if HAVE_GSL
 libtest_la_SOURCES += test/declgen.c