X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/02413704070c34bec00184120c4728854671d2d5..6d601969de9687819347cf27df8ddf6ab026e4b0:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 82a6c0d..36bba03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,13 +23,12 @@ MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 
 DISTCLEANFILES =
 
-CLEANFILES = src/validtypes.h src/namespecs.h src/ordspecs.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/ordspecs.sed src/parse.y src/parse.stamp src/scan.l \
-             src/scan.stamp COPYING.WTFPL2 README.md INSTALL
+             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
 
@@ -42,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)
 
@@ -66,7 +64,7 @@ libmain_a_SOURCES = src/cdecl99.c src/options.h
 $(libmain_a_OBJECTS): $(gnulib_headers)
 $(libmain_a_OBJECTS): src/options.h
 
-check_PROGRAMS = test/crossparse
+check_PROGRAMS = test/crossparse test/normalize
 check_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(GSL_LIBS)
 libtest_la_SOURCES = test/testlib.c
@@ -81,31 +79,22 @@ test_crossparse_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_crossparse_OBJECTS): $(gnulib_headers)
 test_randomdecl_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_randomdecl_OBJECTS): $(gnulib_headers)
+test_normalize_LDADD = libtest.la src/output.lo src/normalize.lo \
+                       libcdecl.la libgnu.la
+$(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/normalize.lo: src/ordspecs.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
 	$(AM_V_at) mv -f $@.tmp $@
 
-src/ordspecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/ordspecs.sed
-	$(AM_V_GEN) sed -f $(srcdir)/src/ordspecs.sed \
-		< $(srcdir)/src/specs.lst > $@.tmp
-	$(AM_V_at) mv -f $@.tmp $@
-
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk
 
@@ -214,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