Replace gnulib patch with new common helper macro.

[gob-dx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6422661b0af27a662b706b8440d00107efbcf5f6..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
@@ -207,6 +213,7 @@ atlocal: config.status
          printf ': "$${%s=%s}"\n' \
            CC '$(CC)' \
            CXX '$(CXX)' \
+           AWK '$(AWK)' \
            CPPFLAGS '$(CPPFLAGS)' \
            CFLAGS '$(CFLAGS)' \
            CXXFLAGS '$(CXXFLAGS)' \