X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/1aa75d411dd68f6e015a747a39b5179cb5573bb8..f0cd5b9c13a412c2248b74da2cef04ec9bcffc10:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae3dae8..f7f54e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2019-2020 Nick Bowler
+# Copyright © 2019-2021 Nick Bowler
 #
 # Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
 #
@@ -9,26 +9,31 @@
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
-              -I$(builddir) -I$(srcdir) -DPKGDATADIR=\"$(pkgdatadir)\"
+              -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+              -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CFLAGS = $(LIBGLIB_CFLAGS)
 AM_YFLAGS = -d -t
 
 bin_PROGRAMS = gob2
 
-EXTRA_DIST = COPYING.GPL3 COPYING.generated-code \
+EXTRA_DIST = COPYING.GPL3 COPYING.generated-code common/scripts/fix-gnulib.pl \
              examples/GNOME_Foo_SomeInterface.idl examples/README \
              examples/foo-some-interface.gob examples/gtk-button-count.gob \
              examples/my-glade-main.c examples/my-glade.glade \
              examples/my-glade.gob gob2.spec src/generate_treefuncs.pl \
              src/lexer.l src/lexer.stamp src/treefuncs.def \
              src/treefuncs.stamp t/str.gob t/test-fooable.c t/test-fooable.h \
-             t/test.gob
+             t/test.gob m4/gnulib-cache.m4 bootstrap
 
-CLEANFILES =
+CLEANFILES = $(EXTRA_LIBRARIES)
 DISTCLEANFILES =
+MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES = src/lexer.c src/lexer.h src/lexer.stamp \
                        src/treefuncs.c src/treefuncs.h src/treefuncs.stamp
 
+# For Gnulib
+EXTRA_LIBRARIES =
+
 EXTRA_PROGRAMS = parser-rdeps
 parser_rdeps_SOURCES = src/main.c src/lexer.c
 $(parser_rdeps_OBJECTS): src/parse.h
@@ -37,8 +42,8 @@ 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
-gob2_LDADD = $(LIBGLIB_LIBS)
-$(gob2_OBJECTS): src/treefuncs.h
+gob2_LDADD = $(LIBGLIB_LIBS) libgnu.a
+$(gob2_OBJECTS): src/treefuncs.h $(gnulib_headers)
 
 man_MANS = doc/gob2.1
 EXTRA_DIST += doc/makehtml.pl
@@ -205,4 +210,5 @@ atlocal: config.status
 check_DATA = atlocal
 CLEANFILES += atlocal
 
+include $(top_srcdir)/lib/gnulib.mk
 include $(top_srcdir)/common/snippet/autotest.mk