Bump dxcommon to pull in build portability improvements.

[gob-dx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f7f54e69216fd5296d09aeef577822d2a2365a39..6422661b0af27a662b706b8440d00107efbcf5f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,9 @@ $(parser_rdeps_OBJECTS): src/parse.h
 noinst_HEADERS = src/main.h src/treefuncs.h src/out.h src/util.h src/checks.h
 
 gob2_SOURCES = src/main.c src/main.h src/treefuncs.c src/out.c src/util.c \
-               src/checks.c src/parse.y src/lexer.c src/lexer.h
+               src/checks.c src/parse.y src/lexer.c src/lexer.h src/options.h
 gob2_LDADD = $(LIBGLIB_LIBS) libgnu.a
-$(gob2_OBJECTS): src/treefuncs.h $(gnulib_headers)
+$(gob2_OBJECTS): src/treefuncs.h src/options.h $(gnulib_headers)
 
 man_MANS = doc/gob2.1
 EXTRA_DIST += doc/makehtml.pl
@@ -77,6 +77,14 @@ endif
                  $(abs_srcdir)/src/treefuncs.def; )
        $(AM_V_at) mv -f $@.tmp $@
 
+OPTFILES = src/options.opt
+.opt.h:
+       $(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
+       $(AM_V_at) mv -f $@.tmp $@
+$(OPTFILES:.opt=.h): $(DX_BASEDIR)/scripts/gen-options.awk
+MAINTAINERCLEANFILES += $(OPTFILES:.opt=.h)
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
+
 .l.c: ;
 .l.stamp:
 if !HAVE_FLEX
@@ -122,12 +130,17 @@ uninstall-gob2-html:
 m4dir = $(datadir)/aclocal
 m4_DATA = gob2.m4
 
-gob2.m4: $(top_srcdir)/common/m4/gob2.m4
-       $(AM_V_GEN) $(SED) 's/DX_PROG_GOB2/GOB2_CHECK/g' \
-         $(top_srcdir)/common/m4/gob2.m4 >$@.tmp
+gob2.m4: $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
+       $(AM_V_GEN) :; { \
+         $(SED) -e 's/DX_PROG_GOB2/GOB2_CHECK/g' \
+                -e 's/DX_BASENAME/GOB2_BASENAME/g' \
+                $(DX_BASEDIR)/m4/gob2.m4 && echo && \
+         $(SED) -e 's/DX_/GOB2_/g' -e 's/dx_fn_/gob2_fn_/g' \
+                $(DX_BASEDIR)/m4/basename.m4; \
+       } >$@.tmp
        $(AM_V_at) mv -f $@.tmp $@
 DISTCLEANFILES += gob2.m4
-EXTRA_DIST += common/m4/gob2.m4
+EXTRA_DIST += $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
 
 git_changelog_start = 2cd951c678998b2b0230c8eb25717ecf0f1dd2db
 dist-hook: generate-changelog
@@ -203,6 +216,7 @@ atlocal: config.status
            LIBGOBJECT_CFLAGS '$(LIBGOBJECT_CFLAGS)' \
            LIBGOBJECT_LIBS '$(LIBGOBJECT_LIBS)' \
            HAVE_GOBJECT '$(HAVE_GOBJECT)' \
+           HAVE_GOBJECT_PRIVATES '$(HAVE_GOBJECT_PRIVATES)' \
            HAVE_GTK2 '$(HAVE_GTK2)' \
            pkgdatadir '$(pkgdatadir)' \
            ; } >$@.tmp