X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/d3e3654f75d01376794676885589a911d4b12e41..519f8a57b1353d595b3e6e9aa0ff50eaffb164ca:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ce76be1..44b4601 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,30 +23,29 @@ MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 
 DISTCLEANFILES =
 
-CLEANFILES = src/validtypes.h src/errtab.h src/namespecs.h src/ordspecs.h \
+CLEANFILES = src/validtypes.h src/namespecs.h src/ordspecs.h \
              test/typegen.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/errors.lst src/strtab.sed test/typegen.sh \
-             src/parse.y src/parse.stamp src/scan.l src/scan.stamp \
-             COPYING.WTFPL2 README.md INSTALL
+             src/ordspecs.sed test/typegen.sh src/parse.y src/parse.stamp \
+             src/scan.l src/scan.stamp COPYING.WTFPL2 README.md INSTALL
 
-dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
+dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = conf_pre.h conf_post.h src/typemap.h src/output.h src/scan.h \
-	src/parse.h src/i18n.h src/normalize.h src/error.h src/history.h \
-	test/declgen.h test/test.h
+noinst_HEADERS = conf_pre.h conf_post.h src/scan.h src/parse.h \
+                 test/declgen.h test/test.h
 
 noinst_DATA = $(MOFILES)
 
 lib_LTLIBRARIES = libcdecl.la
-libcdecl_la_LDFLAGS = -no-undefined \
-	-export-symbols-regex '^cdecl_[[:lower:]]'
+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/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)
 
@@ -78,9 +77,9 @@ libtest_la_SOURCES += test/declgen.c
 check_PROGRAMS += test/randomdecl
 endif
 
-test_crossparse_LDADD = libcdecl.la libtest.la libgnu.la
+test_crossparse_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_crossparse_OBJECTS): $(gnulib_headers)
-test_randomdecl_LDADD = libcdecl.la libtest.la libgnu.la
+test_randomdecl_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_randomdecl_OBJECTS): $(gnulib_headers)
 
 src/parse.lo: src/scan.h
@@ -107,11 +106,6 @@ src/ordspecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/ordspecs.sed
 		< $(srcdir)/src/specs.lst > $@.tmp
 	$(AM_V_at) mv -f $@.tmp $@
 
-src/errtab.h: $(srcdir)/src/errors.lst $(srcdir)/src/strtab.sed
-	$(AM_V_GEN)sed -f $(srcdir)/src/strtab.sed \
-		< $(srcdir)/src/errors.lst > $@.tmp
-	$(AM_V_at)mv -f $@.tmp $@
-
 test/typegen.h: $(srcdir)/src/types.lst $(srcdir)/test/typegen.sh
 	$(AM_V_GEN) $(SHELL) $(srcdir)/test/typegen.sh \
 		< $(srcdir)/src/types.lst > $@.tmp
@@ -129,11 +123,9 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
 	--msgid-bugs-address=$(PACKAGE_BUGREPORT) \
 	--keyword=_ --keyword=N_ --keyword=PN_:1c,2
 
-po/$(PACKAGE).pot: $(SOURCES) src/errors.lst
+po/$(PACKAGE).pot: $(SOURCES)
 	$(AM_V_at)  $(MKDIR_P) $(@D)
 	$(AM_V_GEN) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
-	$(AM_V_at)  $(XGETTEXT) $(XGETTEXT_OPTS) --omit-header -Lc \
-		-ajo $@.tmp src/errors.lst
 	$(AM_V_at)  mv -f $@.tmp $@
 
 # These are required to prevent the builtin lex/yacc rules from
@@ -193,6 +185,14 @@ distcheck-hook:
 	      echo '       *** be the stub from a git checkout.  The "git" and "perl"'; \
 	      echo '       *** programs are required for ChangeLog generation to work.'; \
 	      $(TEST_DISTRIBUTION_OR_ERROR); } >&2
+	$(GENERIC_V) : 'CHECK   ' NEWS; \
+	  $(AWK) 'NR == 1 && $$NF != "$(PACKAGE_VERSION):" \
+	    { print FILENAME ":" NR ":", $$0; exit 1}' \
+	    $(distdir)/NEWS || { \
+	      echo 'ERROR: *** First line of NEWS should match the package version'; \
+	      echo '       *** $(PACKAGE_VERSION), but that does not appear to be the case.'; \
+	      echo '       *** Remember to update NEWS before preparing a release.'; \
+	      $(TEST_DISTRIBUTION_OR_ERROR); } >&2
 
 OPTFILES = src/options.opt
 .opt.h:
@@ -202,7 +202,7 @@ $(OPTFILES:.opt=.h): $(DX_BASEDIR)/scripts/gen-options.awk
 MAINTAINERCLEANFILES += $(OPTFILES:.opt=.h)
 EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
 
-STRFILES = src/commands.str
+STRFILES = src/commands.str src/errtab.str
 .str.h:
 	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
 	$(AM_V_at) mv -f $@.tmp $@