cdecl99: Combine all the main command implementations.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e9a16fc6d2207c633984a788aff8532a2bd5f2b6..e7cfb6bc232c1b84b0911a965f38a13df6291dff 100644 (file)
--- 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$(DX_BASEDIR)/src -I$(top_builddir)/test \
+       -I$(DX_BASEDIR)/src -I$(top_builddir)/t \
        -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
        -DLOCALEDIR=\"$(localedir)\"
 
@@ -30,8 +30,8 @@ EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
 dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
 
 include_HEADERS = src/cdecl.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_HEADERS = conf_pre.h conf_post.h common/src/help.h common/src/tap.h \
+                 common/src/xtra.h src/scan.h src/parse.h t/declgen.h t/test.h
 
 noinst_DATA = $(MOFILES)
 
@@ -43,15 +43,11 @@ libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_([[:lower:]]|_gl_)' \
                       -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/error.c src/normalize.c \
-                      src/cdecl-internal.h
+                      src/keywords.c src/cdecl-internal.h src/errmsg.h
 libcdecl_la_LIBADD = $(shared_gl_objects) $(LTLIBINTL) $(LIBTHREAD)
 EXTRA_libcdecl_la_DEPENDENCIES = $(shared_gl_objects)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
-if USE_NLS
-libcdecl_la_SOURCES += src/i18n.c
-endif
-
 EXTRA_LIBRARIES = libgnu.a
 libgnu_a_SOURCES =
 libgnu_a_SHORTNAME = s
@@ -64,12 +60,13 @@ dummy $(static_gl_objects): $(gnulib_headers)
 
 bin_PROGRAMS = cdecl99
 cdecl99_SOURCES = common/src/help.c src/commands.c src/cdecl99.h
-cdecl99_LDADD = $(libmain_a_OBJECTS) $(libexec_a_OBJECTS) libcdecl.la \
-                libgnu.a $(LTLIBINTL) $(LTLIBREADLINE)
+EXTRA_cdecl99_DEPENDENCIES = $(libmain_a_OBJECTS) $(libexec_a_OBJECTS)
+cdecl99_LDADD = $(EXTRA_cdecl99_DEPENDENCIES) libcdecl.la libgnu.a \
+                $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
 
 if USE_NLS
-cdecl99_SOURCES += common/src/copysym.c
+cdecl99_SOURCES += common/src/copysym.c common/src/copysym.h
 endif
 
 EXTRA_LIBRARIES += libexec.a
@@ -82,32 +79,41 @@ 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 test/randomdecl test/rng-test
+check_PROGRAMS = t/crossparse t/normalize t/randomdecl t/rng-test
 check_LIBRARIES = libtest.a
-libtest_a_SOURCES = test/testlib.c test/rng.c common/src/help.c
+libtest_a_SOURCES = t/testlib.c t/rng.c common/src/help.c
 $(libtest_a_OBJECTS): $(gnulib_headers)
 
 TEST_LIBS = libtest.a libcdecl.la libgnu.a $(LDEXP_LIBM)
 
-test_randomdecl_SOURCES = test/randomdecl.c test/declgen.c
-test_randomdecl_LDADD = $(TEST_LIBS)
-$(test_randomdecl_OBJECTS): $(gnulib_headers)
+t_randomdecl_SOURCES = t/randomdecl.c t/declgen.c
+t_randomdecl_LDADD = $(TEST_LIBS)
+$(t_randomdecl_OBJECTS): $(gnulib_headers)
 
-test_crossparse_LDADD = $(TEST_LIBS)
-$(test_crossparse_OBJECTS): $(gnulib_headers)
+t_crossparse_LDADD = $(TEST_LIBS)
+$(t_crossparse_OBJECTS): $(gnulib_headers)
 
-test_normalize_LDADD = src/output.lo src/normalize.lo $(TEST_LIBS)
-$(test_normalize_OBJECTS): $(gnulib_headers)
+t_normalize_LDADD = src/normalize.lo $(TEST_LIBS)
+$(t_normalize_OBJECTS): $(gnulib_headers)
 
-test_rng_test_LDADD = $(TEST_LIBS)
-$(test_rng_test_OBJECTS): $(gnulib_headers)
-EXTRA_DIST += test/xos256p.c
+t_rng_test_LDADD = $(TEST_LIBS)
+$(t_rng_test_OBJECTS): $(gnulib_headers)
+EXTRA_DIST += t/xos256p.c
 
-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/output.lo: src/specstr.h
-test/declgen.$(OBJEXT): test/typegen.h
+src/error.lo: src/errmsg.h
+src/keywords.lo: src/parse.h
+src/output.lo: src/parse.h src/specstr.h
+src/parse-decl.lo: src/scan.h src/parse.h src/typemap.h src/errmsg.h
+src/parse.lo: src/scan.h src/errmsg.h
+src/scan.lo: src/parse.h src/errmsg.h
+t/declgen.$(OBJEXT): t/typegen.h
+t/cdeclerr.$(OBJEXT): src/errmsg.h
+
+check_PROGRAMS += t/cdeclerr
+t_cdeclerr_SOURCES = common/src/tap.c t/cdeclerr.c
+EXTRA_t_cdeclerr_DEPENDENCIES = src/error.lo $(shared_gl_objects)
+t_cdeclerr_LDADD = $(EXTRA_t_cdeclerr_DEPENDENCIES) $(LIBTHREAD)
+$(t_cdeclerr_OBJECTS): $(gnulib_headers)
 
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk
@@ -200,7 +206,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/errmsg.str
 .str.h:
        $(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
        $(AM_V_at) mv -f $@.tmp $@
@@ -231,12 +237,12 @@ src/typemap.h: src/gen-typemap.awk src/types.lst
 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 \
+t/typegen.h: t/gen-typegen.awk src/types.lst
+       $(AM_V_GEN) $(AWK) -f $(srcdir)/t/gen-typegen.awk \
                              $(srcdir)/src/types.lst >$@.tmp
        $(AM_V_at) mv -f $@.tmp $@
-DISTCLEANFILES += test/typegen.h
-EXTRA_DIST += test/gen-typegen.awk
+DISTCLEANFILES += t/typegen.h
+EXTRA_DIST += t/gen-typegen.awk
 
 # Supporting rules for bison/flex.
 
@@ -256,19 +262,22 @@ DEV_TOOL_ERROR = { \
   echo "       *** configure, consired setting $$toolvar and re-running configure."; \
   echo "       *** See config.log for more details."; } >&2; false
 
+DO_BISON = $(BISON) $(BISON_COMPAT) $(BISONFLAGS)
+
 .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 \
-               rm -f $*.h.tmp; \
-       else \
-               mv -f $*.h.tmp $*.h; \
-       fi
+       $(BISON_V) : >$@.tmp
+       $(AM_V_at) $(DO_BISON) -o $*.c.tmp --defines=$*.h.tmp $<
+       $(AM_V_at) $(AWK) -f $(srcdir)/src/fix-yytname.awk $*.c.tmp >$*.c.t2
+       $(AM_V_at) mv -f $*.c.t2 $*.c
+       $(AM_V_at) cmp $*.h.tmp $*.h >/dev/null 2>&1 || mv -f $*.h.tmp $*.h
+       $(AM_V_at) rm -f $*.c.tmp $*.h.tmp
        $(AM_V_at) mv -f $@.tmp $@
+src/parse.stamp: $(srcdir)/src/fix-yytname.awk
+EXTRA_DIST += src/fix-yytname.awk
 
 .l.c: ;
 .l.stamp:
@@ -296,12 +305,20 @@ endif
                $(MAKE) $(AM_MAKEFLAGS) $<; \
        fi
 
-GPERFFILES = src/execute.gperf
+GPERF     = gperf
+V_GPERF   = $(V_GPERF_@AM_V@)
+V_GPERF_  = $(V_GPERF_@AM_DEFAULT_V@)
+V_GPERF_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GPERF   ' $@;
+
+GPERFFILES = src/execute.gperf src/keywords.gperf
 .gperf.c:
        $(V_GPERF) $(GPERF) $< >$@.tmp
-       $(AM_V_at) mv $@.tmp $@
+       $(AM_V_at) $(AWK) -f $(srcdir)/src/gperf-wordwrap.awk $@.tmp >$@.t2
+       $(AM_V_at) mv $@.t2 $@
+       $(AM_V_at) rm -f $@.tmp
 MAINTAINERCLEANFILES += $(GPERFFILES:.gperf=.c)
-EXTRA_DIST += $(GPERFFILES)
+EXTRA_DIST += $(GPERFFILES) src/gperf-wordwrap.awk
+$(GPERFFILES:.gperf=.c): $(srcdir)/src/gperf-wordwrap.awk
 
 atlocal: config.status
        $(AM_V_GEN) :; { \