X-Git-Url: http://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/00514ec7f1070550a52651971bb6a5e36efbe4f0..198b77a35965824ae4115a3488d3ecb72431c5f6:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58ec75e..eae1366 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 # For Gnulib
 MOSTLYCLEANFILES =
 EXTRA_LTLIBRARIES =
+EXTRA_PROGRAMS =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib \
@@ -30,20 +31,24 @@ 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/scan.h src/parse.h \
-                 t/declgen.h t/test.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
 
 noinst_DATA = $(MOFILES)
 
 nodist_include_HEADERS = src/config/cdecl.h
 src/config/cdecl.h: config.h src/cdecl.h $(DX_BASEDIR)/scripts/bake-config.awk
-	$(AM_V_GEN) $(MKDIR_P) $(@D)
 	$(AM_V_at) $(AWK) -f $(DX_BASEDIR)/scripts/bake-config.awk \
 	  config.h $(srcdir)/src/cdecl.h >$@-t
 	$(AM_V_at) mv -f $@-t $@
 EXTRA_DIST += $(DX_BASEDIR)/scripts/bake-config.awk
 CLEANFILES += src/config/cdecl.h
 
+# Hack to get Automake to emit a dirstamp rule, and use it in src/config/cdecl.h.
+src/config/cdecl.h: src/config/$(am__dirstamp)
+EXTRA_PROGRAMS += src/config/gl-dirstamp
+src_config_gl_dirstamp_SOURCES =
+
 shared_gl_objects = $(gnulib_symfiles:.glsym=.lo)
 static_gl_objects = $(gnulib_extra_objects:.lo=.@OBJEXT@)
 
@@ -113,6 +118,10 @@ check_PROGRAMS += t/rendertest
 t_rendertest_LDADD = $(TEST_LIBS)
 $(t_rendertest_OBJECTS): $(gnulib_headers)
 
+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
+
 src/error.lo: src/errmsg.h
 src/keywords.lo: src/parse.h
 src/output.lo: src/parse.h src/specstr.h
@@ -141,9 +150,9 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
 	--keyword=_ --keyword=N_ --keyword=PN_:1c,2
 
 po/$(PACKAGE).pot: $(SOURCES)
-	$(AM_V_at)  $(MKDIR_P) $(@D)
-	$(AM_V_GEN) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
-	$(AM_V_at)  mv -f $@.tmp $@
+	$(AM_V_GEN) $(MKDIR_P) po
+	$(AM_V_at) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
+	$(AM_V_at) mv -f $@.tmp $@
 
 # These are required to prevent the builtin lex/yacc rules from
 # superseding ours...
@@ -334,12 +343,9 @@ EXTRA_DIST += $(GPERFFILES) src/gperf-wordwrap.awk
 $(GPERFFILES:.gperf=.c): $(srcdir)/src/gperf-wordwrap.awk
 
 atlocal: config.status
-	$(AM_V_GEN) :; { \
-	  printf ': "$${%s=%s}"\n' \
-	    AWK '$(AWK)' \
-	    EXEEXT '$(EXEEXT)' \
-	    check_PROGRAMS '$(check_PROGRAMS)' \
-	    ; } >$@.tmp
+	$(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)'
 	$(AM_V_at) mv -f $@.tmp $@
 check_DATA = atlocal
 CLEANFILES += atlocal
@@ -348,7 +354,7 @@ CLEANFILES += atlocal
 # refer to the just-installed .la file, rather than more typical library flags
 # (-Lfoo -lfoo).  Otherwise libtool can pick up libcdecl.la from the current
 # working directory which defeats the point of an install check.
-EXTRA_PROGRAMS = t/installcheck
+EXTRA_PROGRAMS += t/installcheck
 t_installcheck_CPPFLAGS = -I$(DESTDIR)$(includedir)
 t_installcheck_LDADD = $(DESTDIR)$(libdir)/libcdecl.la
 t_installcheck_CFLAGS =