Fix incremental rebuild after deleted scan.c.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cb50bfc3d5e95ead2c612ccdb14dab58100fe7d8..4776ec7fdca2964d3d6c7241798db38cafa6900d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,9 @@ MOSTLYCLEANFILES =
 EXTRA_LTLIBRARIES =
 EXTRA_PROGRAMS =
 
+# Ensure .stamp rules are handled first
+SUFFIXES = .stamp
+
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
        -I$(top_builddir)/lib -I$(top_srcdir)/lib \
        -I$(DX_BASEDIR)/src -I$(top_builddir)/t \
@@ -32,8 +35,9 @@ EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
 dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
 
 noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h common/src/tap.h \
-                 common/src/xtra.h src/cdecl.h src/intconv.h src/scan.h \
-                 src/parse.h src/version.h t/declgen.h t/test.h
+                 common/src/xtra.h src/cdecl.h src/intconv.h src/parse.h \
+                 src/scan.h src/thread-posix.h src/thread-stdc.h \
+                 src/thread-w32.h src/version.h t/declgen.h t/test.h
 
 noinst_DATA = $(MOFILES)
 
@@ -123,6 +127,21 @@ check_PROGRAMS += t/scantest
 t_scantest_LDADD = src/scan.lo src/parse.lo src/keywords.lo $(TEST_LIBS)
 $(t_scantest_OBJECTS): $(gnulib_headers) src/scan.h src/parse.h
 
+EXTRA_LTLIBRARIES += t/liberrtest.la
+t_liberrtest_la_SOURCES = src/error.c t/errmemwrap.c
+t_liberrtest_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_MALLOC_HOOK
+t_liberrtest_la_LDFLAGS  = -no-undefined -avoid-version \
+                            -bindir '$(bindir)' -rpath '$(libdir)'
+EXTRA_t_liberrtest_la_DEPENDENCIES = $(shared_gl_objects)
+t_liberrtest_la_LIBADD = src/output.lo $(EXTRA_t_liberrtest_la_DEPENDENCIES) \
+                         $(LTLIBINTL) $(LIBTHREAD)
+t_liberrtest_la_SHORTNAME = t
+$(t_liberrtest_la_OBJECTS): $(gnulib_headers)
+
+check_PROGRAMS += t/errthread
+t_errthread_LDADD = t/liberrtest.la libtest.a $(LIBMULTITHREAD)
+$(t_errthread_OBJECTS): $(gnulib_headers) src/errmsg.h
+
 src/error.lo: src/errmsg.h
 src/keywords.lo: src/parse.h
 src/output.lo: src/parse.h src/specstr.h
@@ -133,9 +152,10 @@ t/declgen.$(OBJEXT): t/typegen.h
 t/cdeclerr.$(OBJEXT): src/errmsg.h
 
 check_PROGRAMS += t/cdeclerr
-t_cdeclerr_SOURCES = common/src/tap.c t/cdeclerr.c
+t_cdeclerr_SOURCES = t/cdeclerr.c
 EXTRA_t_cdeclerr_DEPENDENCIES = src/error.lo src/output.lo $(shared_gl_objects)
-t_cdeclerr_LDADD = $(EXTRA_t_cdeclerr_DEPENDENCIES) $(LTLIBINTL) $(LIBTHREAD)
+t_cdeclerr_LDADD = $(EXTRA_t_cdeclerr_DEPENDENCIES) \
+                   libtest.a $(LTLIBINTL) $(LIBTHREAD)
 $(t_cdeclerr_OBJECTS): $(gnulib_headers)
 
 # Supporting rules for gettext.
@@ -346,7 +366,8 @@ $(GPERFFILES:.gperf=.c): $(srcdir)/src/gperf-wordwrap.awk
 atlocal: config.status
        $(AM_V_GEN) $(AWK) </dev/null >$@.tmp \
          'BEGIN{ for (i = 1; i < ARGC; i++) print ": \"$${" ARGV[i] "}\""; }' \
-         'AWK=$(AWK)' 'EXEEXT=$(EXEEXT)' 'check_PROGRAMS=$(check_PROGRAMS)'
+         'AWK=$(AWK)' 'EXEEXT=$(EXEEXT)' 'check_PROGRAMS=$(check_PROGRAMS)' \
+         'host_os=$(host_os)'
        $(AM_V_at) mv -f $@.tmp $@
 check_DATA = atlocal
 CLEANFILES += atlocal