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

diff --git a/Makefile.am b/Makefile.am
index 36bba03..3955dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib \
-	-I$(top_builddir)/test \
+	-I$(DX_BASEDIR)/src -I$(top_builddir)/test \
 	-DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
 	-DLOCALEDIR=\"$(localedir)\"
 
@@ -23,36 +23,38 @@ MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 
 DISTCLEANFILES =
 
-CLEANFILES = src/namespecs.h $(EXTRA_LTLIBRARIES)
+CLEANFILES = $(EXTRA_LTLIBRARIES)
 
 EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
-             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
+             src/types.lst 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
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = conf_pre.h conf_post.h src/scan.h src/parse.h \
-                 test/declgen.h test/test.h
+noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h \
+                 src/scan.h src/parse.h test/declgen.h test/test.h
 
 noinst_DATA = $(MOFILES)
 
 lib_LTLIBRARIES = libcdecl.la
 libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]' \
-                      -no-undefined
+                      -no-undefined -version-info 1:0:0
 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
+                      src/explain.c src/declare.c src/error.c src/normalize.c \
+                      src/cdecl-internal.h
 libcdecl_la_LIBADD = libgnu.la $(LTLIBINTL) $(LTLIBTHREAD)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
+if USE_NLS
+libcdecl_la_SOURCES += src/i18n.c
+endif
+
 bin_PROGRAMS = cdecl99
-cdecl99_SOURCES = src/commands.c src/cdecl99.h
+cdecl99_SOURCES = common/src/help.c 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
@@ -86,15 +88,9 @@ $(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.h
-src/error.lo: src/errtab.h
-src/output.lo: src/namespecs.h
+src/output.lo: src/specstr.h
 test/declgen.lo: test/typegen.h
 
-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 $@
-
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk
 
@@ -186,7 +182,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 src/errtab.str
+STRFILES = src/commands.str
 .str.h:
 	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
 	$(AM_V_at) mv -f $@.tmp $@
@@ -203,6 +199,13 @@ src/cmdlist.h: src/gen-cmdlist.awk src/execute.c
 DISTCLEANFILES += src/cmdlist.h
 EXTRA_DIST += src/gen-cmdlist.awk
 
+src/specstr.h: src/gen-specstr.awk src/cdecl.h
+	$(AM_V_GEN) $(AWK) -f $(srcdir)/src/gen-specstr.awk \
+	                      $(srcdir)/src/cdecl.h >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+DISTCLEANFILES += src/specstr.h
+EXTRA_DIST += src/gen-specstr.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