X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/1c3b0c0e6f9339e76e42f6393e554c7dfc58e205..d994d4c8bc35514ab5fafff7177cdf6d4e3c61ce:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d06784e..1673167 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 common/src/xtra.h \
-                 src/scan.h src/parse.h t/declgen.h t/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,7 +43,7 @@ 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/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)
@@ -64,8 +64,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
@@ -103,11 +104,19 @@ 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/parse.lo: src/scan.h src/errmsg.h
+src/scan.lo: src/parse.h src/errmsg.h
+src/parse-decl.lo: src/scan.h src/parse.h src/typemap.h src/errmsg.h
 src/output.lo: src/specstr.h
+src/error.lo: 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 +209,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 $@