X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/646b0098e58c1deef39ed4d4c142503e427c0553..d994d4c8bc35514ab5fafff7177cdf6d4e3c61ce:/Makefile.am diff --git a/Makefile.am b/Makefile.am index b8749b4..1673167 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$(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 common/src/xtra.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,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 @@ -82,32 +83,40 @@ 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/output.lo 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/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 -test/declgen.$(OBJEXT): test/typegen.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 $@ @@ -231,12 +240,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. @@ -296,6 +305,11 @@ endif $(MAKE) $(AM_MAKEFLAGS) $<; \ fi +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 .gperf.c: $(V_GPERF) $(GPERF) $< >$@.tmp