Replace GOB2_CHECK with the version from dxcommon.

[gob-dx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 41ac9d8cbaa6737cf57809e754dddddf1f726e73..0f6ad3da08ea1b68cabb8542f22422df9465f349 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2019 Nick Bowler
+# Copyright © 2019-2020 Nick Bowler
 #
 # Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
 #
@@ -6,9 +6,11 @@
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
 
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
+
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
               -I$(builddir) -I$(srcdir) -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = $(GLIB_CFLAGS)
+AM_CFLAGS = $(LIBGLIB_CFLAGS)
 AM_YFLAGS = -d -t
 
 bin_PROGRAMS = gob2
@@ -18,7 +20,8 @@ EXTRA_DIST = COPYING.generated-code examples/GNOME_Foo_SomeInterface.idl \
              examples/gtk-button-count.gob examples/my-glade-main.c \
              examples/my-glade.glade examples/my-glade.gob gob2.spec \
              src/treefuncs.c src/treefuncs.h src/treefuncs.stamp \
-             src/treefuncs.def src/generate_treefuncs.pl
+             src/treefuncs.def src/generate_treefuncs.pl \
+             t/test.gob t/str.gob
 
 CLEANFILES =
 DISTCLEANFILES =
@@ -32,7 +35,7 @@ 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.l
-gob2_LDADD = $(GLIB_LIBS) @LEXLIB@
+gob2_LDADD = $(LIBGLIB_LIBS) @LEXLIB@
 $(gob2_OBJECTS): src/treefuncs.h
 
 man_MANS = doc/gob2.1
@@ -81,4 +84,13 @@ uninstall-gob2-html:
 .PHONY: uninstall-gob2-html
 
 m4dir = $(datadir)/aclocal
-dist_m4_DATA = gob2.m4
+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
+       $(AM_V_at) mv -f $@.tmp $@
+DISTCLEANFILES += gob2.m4
+EXTRA_DIST += common/m4/gob2.m4
+
+include $(top_srcdir)/common/snippet/autotest.mk