X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/e0179c069958050100a637bb876c96495276ea76..4ac33123a76ec76911d599f212e1b47412730614:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95f50cf..6556f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,44 +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 \
+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
 
 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 src/options.h
-cdecl99_LDADD = libcdecl.la libgnu.la \
-                $(LTLIBICONV) $(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
 
+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
 check_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(GSL_LIBS)
@@ -97,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
@@ -119,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
@@ -192,6 +194,23 @@ $(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
+
 # Supporting rules for bison/flex.
 
 BISON_V   = $(BISON_V_@AM_V@)
@@ -250,6 +269,13 @@ endif
 		$(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' \