Replace gnulib patch with new common helper macro.

[gob-dx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a693aced024113b7c0985bc112cf3775fb448dbb..c7ca686336571964e5b662a9542082c02cba443e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2019-2021 Nick Bowler
+# Copyright © 2019-2022 Nick Bowler
 #
 # Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
 #
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-              -DPKGDATADIR=\"$(pkgdatadir)\"
+              -I$(DX_BASEDIR)/src -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CFLAGS = $(LIBGLIB_CFLAGS)
 AM_YFLAGS = -d -t
 
@@ -38,12 +38,18 @@ EXTRA_PROGRAMS = parser-rdeps
 parser_rdeps_SOURCES = src/main.c src/lexer.c
 $(parser_rdeps_OBJECTS): src/parse.h
 
-noinst_HEADERS = src/main.h src/treefuncs.h src/out.h src/util.h src/checks.h
+noinst_HEADERS = src/main.h src/treefuncs.h src/out.h src/util.h src/checks.h \
+                 common/src/help.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/options.h
+               src/checks.c src/parse.y src/lexer.c src/lexer.h src/options.h \
+               common/src/help.c
 gob2_LDADD = $(LIBGLIB_LIBS) libgnu.a
-$(gob2_OBJECTS): src/treefuncs.h src/options.h $(gnulib_headers)
+$(gob2_OBJECTS): $(gnulib_headers) src/treefuncs.h src/options.h
+
+if GOB_STRCASE
+gob2_SOURCES += src/gob-strcase.c
+endif
 
 man_MANS = doc/gob2.1
 EXTRA_DIST += doc/makehtml.pl
@@ -130,12 +136,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
@@ -202,6 +213,7 @@ atlocal: config.status
          printf ': "$${%s=%s}"\n' \
            CC '$(CC)' \
            CXX '$(CXX)' \
+           AWK '$(AWK)' \
            CPPFLAGS '$(CPPFLAGS)' \
            CFLAGS '$(CFLAGS)' \
            CXXFLAGS '$(CXXFLAGS)' \
@@ -211,6 +223,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