X-Git-Url: http://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/9abf0eb2e74d0fb3a4f652499571cb35697d3036..72aedaedd7afa666f7c69dfe7ef4b7ec3dbc2458:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 14ef3b1..336e443 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,8 +60,9 @@ 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
@@ -96,22 +93,29 @@ $(t_randomdecl_OBJECTS): $(gnulib_headers)
 t_crossparse_LDADD = $(TEST_LIBS)
 $(t_crossparse_OBJECTS): $(gnulib_headers)
 
-t_normalize_LDADD = src/output.lo src/normalize.lo $(TEST_LIBS)
+t_normalize_LDADD = src/normalize.lo $(TEST_LIBS)
 $(t_normalize_OBJECTS): $(gnulib_headers)
 
 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
+check_PROGRAMS += t/rendertest
+t_rendertest_LDADD = $(TEST_LIBS)
+$(t_rendertest_OBJECTS): $(gnulib_headers)
+
+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)
+EXTRA_t_cdeclerr_DEPENDENCIES = src/error.lo src/output.lo $(shared_gl_objects)
 t_cdeclerr_LDADD = $(EXTRA_t_cdeclerr_DEPENDENCIES) $(LIBTHREAD)
 $(t_cdeclerr_OBJECTS): $(gnulib_headers)
 
@@ -206,7 +210,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 $@
@@ -262,19 +266,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:
@@ -307,12 +314,15 @@ 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
+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) :; { \