Use awk over printf when generating atlocal.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee4f7799cb56a250695e637ce2f3888f098f200e..87cf0bd7950f5855e680d80fa09f8aed5b8968de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,12 +29,21 @@ EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
 
 dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
 
-include_HEADERS = src/cdecl.h
 noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h common/src/tap.h \
-                 common/src/xtra.h src/scan.h src/parse.h t/declgen.h t/test.h
+                 common/src/xtra.h src/cdecl.h src/scan.h src/parse.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
+
 shared_gl_objects = $(gnulib_symfiles:.glsym=.lo)
 static_gl_objects = $(gnulib_extra_objects:.lo=.@OBJEXT@)
 
@@ -325,12 +334,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
@@ -346,7 +352,7 @@ t_installcheck_CFLAGS =
 t_installcheck_SHORTNAME = x
 
 installcheck-local:
-       rm -f t/installcheck$(EXEEXT)
+       rm -f t/installcheck$(EXEEXT) $(t_installcheck_OBJECTS)
        $(MAKE) $(AM_MAKEFLAGS) t/installcheck$(EXEEXT)
        t/installcheck$(EXEEXT) | diff - $(srcdir)/t/installcheck.exp
 .PHONY: installcheck-local