X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.am;h=532bccec18301ebcf6d94f9ac5c615626a02dae0;hb=d3b2175e084f88c8736ad7073eacbf4670147aec;hp=b51faf45c52eeba6210a8ec3b25e41d083d5f95e;hpb=34197d9f46a5f4e944378cbb65fca32ee0eec7b9;p=debian%2Famanda

diff --git a/Makefile.am b/Makefile.am
index b51faf4..532bcce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 ACINCLUDE_M4 = $(srcdir)/acinclude.m4
 ACINCLUDE_M4I = $(srcdir)/config/acinclude.m4i
 LIBTOOL_M4I = $(srcdir)/config/libtool.m4i
-ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
+GNULIB_M4I  = $(srcdir)/config/gnulib.m4i
+ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
 
 if WANT_CLIENT
 CLIENT_SUBDIRS = client-src dumper-src
@@ -26,6 +27,7 @@ PLOT_SUBDIRS = amplot
 endif
 # order is significant, don't change it arbitrarily
 SUBDIRS = \
+	gnulib \
 	config \
 	common-src \
 	amandad-src \
@@ -39,9 +41,7 @@ SUBDIRS = \
 
 pkgdata_DATA = \
 	ReleaseNotes			\
-	COPYRIGHT			\
-	COPYRIGHT-APACHE		\
-	COPYRIGHT-REGEX
+	COPYRIGHT
 
 EXTRA_DIST = $(SNAPSHOT_STAMP) \
 	$(pkgdata_DATA)			\
@@ -64,30 +64,7 @@ EXTRA_DIST = $(SNAPSHOT_STAMP) \
 	contrib/gsc/ucfggsc.c		\
 	patches/regex-3.6alpha.patch	\
 	patches/samba-largefs.patch	\
-	patches/tar-1.12.patch		\
-	regex-src/COPYRIGHT		\
-	regex-src/Makefile 		\
-	regex-src/README		\
-	regex-src/WHATSNEW 		\
-	regex-src/cclass.h		\
-	regex-src/cname.h		\
-	regex-src/debug.c		\
-	regex-src/engine.c		\
-	regex-src/main.c		\
-	regex-src/mkh			\
-	regex-src/regcomp.c		\
-	regex-src/regerror.c		\
-	regex-src/regex.3		\
-	regex-src/regex.7		\
-	regex-src/regex2.h		\
-	regex-src/regexec.c		\
-	regex-src/regfree.c		\
-	regex-src/split.c		\
-	regex-src/tests			\
-	regex-src/utils.h		\
-	regex-src/fake/limits.h		\
-	regex-src/fake/memmove.c	\
-	regex-src/fake/stdlib.h
+	patches/tar-1.12.patch
 
 $(ACINCLUDE_M4): $(ACINCLUDE_M4_DEPS)
 	@-rm -f $@
@@ -109,7 +86,6 @@ lint:
 	(cd common-src; make lint)
 	(cd oldrecover-src; make lint)
 	(cd recover-src; make lint)
-	(cd regex-src; make lint)
 	(cd restore-src; make lint)
 	(cd server-src; make lint)
 	(cd tape-src; make lint)