X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f78dde64c011f95274eee188a09495c0f67ed81c..bbfdea24b2b940031e86e990bc457785dd378b58:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4bdc88c..9698512 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,43 +19,53 @@ AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 AM_CFLAGS = $(GSL_CFLAGS)
 
 MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
-	src/parse.c src/parse.h src/parse.stamp
+                       src/parse.c src/parse.h src/parse.stamp
 
 DISTCLEANFILES =
 
-CLEANFILES = src/validtypes.h src/errtab.h src/namespecs.h src/ordspecs.h \
-             test/typegen.h $(EXTRA_LTLIBRARIES)
+CLEANFILES = src/validtypes.h src/namespecs.h $(EXTRA_LTLIBRARIES)
 
-EXTRA_DIST = 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
+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 \
+             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)
 
 bin_PROGRAMS = cdecl99
-cdecl99_SOURCES = src/cdecl99.c
-cdecl99_LDADD = libcdecl.la libgnu.la $(LTLIBINTL) $(LTLIBREADLINE)
+cdecl99_SOURCES = src/commands.c src/cdecl99.h
+cdecl99_LDADD = $(libmain_a_OBJECTS) $(libexec_a_OBJECTS) libcdecl.la \
+                libgnu.la $(LTLIBICONV) $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
+$(cdecl99_OBJECTS): src/options.h
 
-check_PROGRAMS = test/crossparse
+EXTRA_LIBRARIES = libexec.a
+libexec_a_SOURCES = src/execute.c src/commands.h
+$(libexec_a_OBJECTS): $(gnulib_headers)
+$(libexec_a_OBJECTS): src/commands.h src/cmdlist.h
+
+EXTRA_LIBRARIES += libmain.a
+libmain_a_SOURCES = src/cdecl99.c src/options.h
+$(libmain_a_OBJECTS): $(gnulib_headers)
+$(libmain_a_OBJECTS): src/options.h
+
+check_PROGRAMS = test/crossparse test/normalize
 check_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(GSL_LIBS)
 libtest_la_SOURCES = test/testlib.c
@@ -66,17 +76,19 @@ 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)
+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/error.lo: src/errtab.h
-src/normalize.lo: src/ordspecs.h
 src/output.lo: src/namespecs.h
 test/declgen.lo: test/typegen.h
 
@@ -90,21 +102,6 @@ src/namespecs.h: $(srcdir)/src/specs.lst $(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 $@
-
-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
-	$(AM_V_at)mv -f $@.tmp $@
-
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk
 
@@ -117,11 +114,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
@@ -181,6 +176,46 @@ 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:
+	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+$(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 src/errtab.str
+.str.h:
+	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+$(STRFILES:.str=.h): $(DX_BASEDIR)/scripts/gen-strtab.awk
+MAINTAINERCLEANFILES += $(STRFILES:.str=.h)
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-strtab.awk $(STRFILES)
+
+src/cmdlist.h: src/gen-cmdlist.awk src/execute.c
+	$(AM_V_GEN) if test -f '$(builddir)/src/execute.c'; \
+	  then f='$(builddir)/src/execute.c'; \
+	  else f='$(srcdir)/src/execute.c'; \
+	  fi; $(AWK) -f $(srcdir)/src/gen-cmdlist.awk "$$f" >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+DISTCLEANFILES += src/cmdlist.h
+EXTRA_DIST += src/gen-cmdlist.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
+	$(AM_V_at) mv -f $@.tmp $@
+DISTCLEANFILES += test/typegen.h
+EXTRA_DIST += test/gen-typegen.awk
 
 # Supporting rules for bison/flex.
 
@@ -192,10 +227,19 @@ FLEX_V   = $(FLEX_V_@AM_V@)
 FLEX_V_  = $(FLEX_V_@AM_DEFAULT_V@)
 FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 
-.y.c: ;
-.l.c: ;
+DEV_TOOL_ERROR = { \
+  echo "ERROR: *** $$tool is missing on your system."; \
+  echo "       *** Because of this, I cannot compile $$toolsrc, but"; \
+  echo "       *** (perhaps because you modified it) the sources appear out"; \
+  echo "       *** of date.  If $$tool is installed but was not detected by"; \
+  echo "       *** configure, consired setting $$toolvar and re-running configure."; \
+  echo "       *** See config.log for more details."; } >&2; false
 
+.y.c: ;
 .y.stamp:
+if !HAVE_BISON
+	$(BISON_V)tool=bison toolvar=BISON toolsrc=$<; $(DEV_TOOL_ERROR)
+endif
 	$(AM_V_at) touch $@.tmp
 	$(BISON_V) $(BISON) $(BISON_COMPAT) -o $*.c --defines=$*.h.tmp $(BISONFLAGS) $<
 	$(AM_V_at) if cmp $*.h.tmp $*.h >/dev/null 2>&1; then \
@@ -205,7 +249,11 @@ FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 	fi
 	$(AM_V_at) mv -f $@.tmp $@
 
+.l.c: ;
 .l.stamp:
+if !HAVE_FLEX
+	$(FLEX_V)tool=flex toolvar=FLEX toolsrc=$<; $(DEV_TOOL_ERROR)
+endif
 	$(AM_V_at) touch $@.tmp
 	$(FLEX_V) $(FLEX) -o $*.c --header-file=$*.h.tmp $(FLEXFLAGS) $<
 	$(AM_V_at) if cmp $*.h.tmp $*.h >/dev/null 2>&1; then \
@@ -227,6 +275,13 @@ FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 		$(MAKE) $(AM_MAKEFLAGS) $<; \
 	fi
 
+GPERFFILES = src/execute.gperf
+.gperf.c:
+	$(V_GPERF) $(GPERF) $< >$@.tmp
+	$(AM_V_at) mv $@.tmp $@
+MAINTAINERCLEANFILES += $(GPERFFILES:.gperf=.c)
+EXTRA_DIST += $(GPERFFILES)
+
 atlocal: config.status
 	$(AM_V_GEN) :; { \
 	  printf ': "$${%s=%s}"\n' \