Restructure the type specifier check.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9698512190b33e6f42221ea86b9675fda4f725a0..36bba03d9834692c0fa5e78352879ae2e52cd101 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,11 @@ MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 
 DISTCLEANFILES =
 
-CLEANFILES = src/validtypes.h src/namespecs.h $(EXTRA_LTLIBRARIES)
+CLEANFILES = src/namespecs.h $(EXTRA_LTLIBRARIES)
 
 EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
-             src/types.lst src/validtypes.sed src/specs.lst src/namespecs.sed \
-             src/parse.y src/parse.stamp src/scan.l src/scan.stamp \
+             src/types.lst src/specs.lst src/namespecs.sed src/parse.y \
+             src/parse.stamp src/scan.l src/scan.stamp \
              COPYING.WTFPL2 README.md INSTALL
 
 dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
@@ -41,10 +41,9 @@ noinst_DATA = $(MOFILES)
 lib_LTLIBRARIES = libcdecl.la
 libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]' \
                       -no-undefined
-libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/typemap.c \
-                      src/output.c src/explain.c src/declare.c src/i18n.c \
-                      src/error.c src/normalize.c src/cdecl-internal.h \
-                      src/errtab.h
+libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/output.c \
+                      src/explain.c src/declare.c src/i18n.c src/error.c \
+                      src/normalize.c src/cdecl-internal.h src/errtab.h
 libcdecl_la_LIBADD = libgnu.la $(LTLIBINTL) $(LTLIBTHREAD)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
@@ -86,17 +85,11 @@ $(test_normalize_OBJECTS): $(gnulib_headers)
 
 src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
-src/parse-decl.lo: src/scan.h src/parse.h
-src/typemap.lo: src/validtypes.h
+src/parse-decl.lo: src/scan.h src/parse.h src/typemap.h
 src/error.lo: src/errtab.h
 src/output.lo: src/namespecs.h
 test/declgen.lo: test/typegen.h
 
-src/validtypes.h: $(srcdir)/src/types.lst $(srcdir)/src/validtypes.sed
-       $(AM_V_GEN)sed -f $(srcdir)/src/validtypes.sed \
-               < $(srcdir)/src/types.lst > $@.tmp
-       $(AM_V_at)mv -f $@.tmp $@
-
 src/namespecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/namespecs.sed
        $(AM_V_GEN) sed -f $(srcdir)/src/namespecs.sed \
                < $(srcdir)/src/specs.lst > $@.tmp
@@ -210,6 +203,13 @@ src/cmdlist.h: src/gen-cmdlist.awk src/execute.c
 DISTCLEANFILES += src/cmdlist.h
 EXTRA_DIST += src/gen-cmdlist.awk
 
+src/typemap.h: src/gen-typemap.awk src/types.lst
+       $(AM_V_GEN) $(AWK) -f $(srcdir)/src/gen-typemap.awk \
+                             $(srcdir)/src/types.lst >$@.tmp
+       $(AM_V_at) mv -f $@.tmp $@
+DISTCLEANFILES += src/typemap.h
+EXTRA_DIST += src/gen-typemap.awk
+
 test/typegen.h: test/gen-typegen.awk src/types.lst
        $(AM_V_GEN) $(AWK) -f $(srcdir)/test/gen-typegen.awk \
                              $(srcdir)/src/types.lst >$@.tmp