Fix error handling in explain.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6921dbb16ef078b494342fd9b6d185681d7dbfee..87635f605e24aeb99dfc91eca0ee3b586da6f62c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,46 @@
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = lib .
+CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
+       -I$(top_builddir)/lib -I$(top_srcdir)/lib
+
 MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
        src/parse.c src/parse.h src/parse.stamp
 
-EXTRA_DIST = src/parse.stamp src/scan.stamp
+CLEANFILES = src/typenames.h src/validtypes.h
+
+EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/typenames.sed \
+       src/validtypes.sed src/parse.stamp src/scan.stamp
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = src/scan.h src/parse.h
+noinst_HEADERS = src/typemap.h src/scan.h src/parse.h
 
 lib_LTLIBRARIES = libcdecl.la
-libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_'
-libcdecl_la_SOURCES = src/scan.c src/parse.c src/libcdecl.c
+libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]'
+libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/typemap.c \
+       src/explain.c
 
 bin_PROGRAMS = cdecl99
 cdecl99_SOURCES = src/cdecl99.c
-cdecl99_LDADD = libcdecl.la
+cdecl99_LDADD = libcdecl.la lib/libgnu.la
+
+src/parse.lo: src/scan.h
+src/scan.lo: src/parse.h
+src/parse-decl.lo: src/scan.h src/parse.h
+src/typemap.lo: src/validtypes.h src/typenames.h
 
-src/parse.$(OBJEXT): src/scan.h
-src/scan.$(OBJEXT): src/parse.h
-src/libcdecl.$(OBJEXT): src/scan.h src/parse.h
+src/validtypes.h: $(srcdir)/src/types.lst $(srcdir)/src/validtypes.sed
+       $(AM_V_GEN)sed -f $(srcdir)/src/validtypes.sed \
+               < $(srcdir)/src/types.lst > $@.tmp
+       $(AM_V_at)mv -f $@.tmp $@
 
-# These are required to prevent the builtin lex/yacc rules from triggering...
+src/typenames.h: $(srcdir)/src/types.lst $(srcdir)/src/typenames.sed
+       $(AM_V_GEN)sed -f $(srcdir)/src/typenames.sed \
+               < $(srcdir)/src/types.lst > $@.tmp
+       $(AM_V_at)mv -f $@.tmp $@
+
+# These are required to prevent the builtin lex/yacc rules from
+# superseding ours...
 src/scan.c src/scan.h: src/scan.stamp
 src/parse.c src/parse.h: src/parse.stamp
 
@@ -39,12 +59,22 @@ FLEX_V_0 = @echo "  FLEX  " $<;
 
 .y.stamp:
        $(AM_V_at) touch $@.tmp
-       $(BISON_V) $(BISON) -o $*.c --defines=$*.h $(BISONFLAGS) $<
+       $(BISON_V) $(BISON) -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
        $(AM_V_at) mv -f $@.tmp $@
 
 .l.stamp:
        $(AM_V_at) touch $@.tmp
-       $(FLEX_V) $(FLEX) -o $*.c --header-file=$*.h $(FLEXFLAGS) $<
+       $(FLEX_V) $(FLEX) -o $*.c --header-file=$*.h.tmp $(FLEXFLAGS) $<
+       $(AM_V_at) if cmp $*.h.tmp $*.h >/dev/null 2>&1; then \
+               rm -f $*.h.tmp; \
+       else \
+               mv -f $*.h.tmp $*.h; \
+       fi
        $(AM_V_at) mv -f $@.tmp $@
 
 .stamp.c: