libcdecl: Prefer memchr over strchr in the scanner.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6d2ea6574b9f349502b1c73de4b1fab95605b9af..336e4439ba82f760cb776d09d7ef32fb8894cafd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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/errmsg.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)
@@ -100,7 +100,12 @@ t_rng_test_LDADD = $(TEST_LIBS)
 $(t_rng_test_OBJECTS): $(gnulib_headers)
 EXTRA_DIST += t/xos256p.c
 
+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
@@ -110,7 +115,7 @@ 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)
 
@@ -309,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) :; { \