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

diff --git a/Makefile.am b/Makefile.am
index 532bcce..81589ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,16 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.4 foreign
+AUTOMAKE_OPTIONS = 1.10 foreign
 
-ACINCLUDE_M4 = $(srcdir)/acinclude.m4
-ACINCLUDE_M4I = $(srcdir)/config/acinclude.m4i
-LIBTOOL_M4I = $(srcdir)/config/libtool.m4i
-GNULIB_M4I  = $(srcdir)/config/gnulib.m4i
-ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
+include $(top_srcdir)/config/automake/vars.am
+include $(top_srcdir)/config/automake/installperms.am
+
+ACLOCAL_AMFLAGS = --force -I config -I . -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive
 
 if WANT_CLIENT
-CLIENT_SUBDIRS = client-src dumper-src
-endif
-if WANT_TAPE
-TAPE_SUBDIRS = tape-src
+CLIENT_SUBDIRS = client-src application-src
 endif
 if WANT_SERVER
-SERVER_SUBDIRS = server-src changer-src
-endif
-if WANT_RESTORE
-RESTORE_SUBDIRS = restore-src
+SERVER_SUBDIRS = device-src server-src changer-src
 endif
 if WANT_RECOVER
 RECOVER_SUBDIRS = recover-src oldrecover-src
@@ -25,25 +18,38 @@ endif
 if WANT_AMPLOT
 PLOT_SUBDIRS = amplot
 endif
+if WANT_NDMP
+NDMP_SUBDIRS = ndmp-src
+endif
 # order is significant, don't change it arbitrarily
-SUBDIRS = \
+SUBDIRS = . \
 	gnulib \
 	config \
 	common-src \
+	amar-src \
 	amandad-src \
+	xfer-src \
+	$(NDMP_SUBDIRS) \
 	$(TAPE_SUBDIRS) \
 	$(CLIENT_SUBDIRS) \
 	$(SERVER_SUBDIRS) \
 	$(RESTORE_SUBDIRS) \
 	$(RECOVER_SUBDIRS) \
 	$(PLOT_SUBDIRS) \
-	man docs example
+	perl \
+	po \
+	man \
+	example \
+	packaging \
+	installcheck
 
 pkgdata_DATA = \
-	ReleaseNotes			\
-	COPYRIGHT
+	ReleaseNotes	\
+	COPYRIGHT	\
+	NEWS		\
+	ChangeLog
 
-EXTRA_DIST = $(SNAPSHOT_STAMP) \
+EXTRA_DIST += $(SNAPSHOT_STAMP) \
 	$(pkgdata_DATA)			\
         autogen 			\
 	contrib/README			\
@@ -64,15 +70,24 @@ EXTRA_DIST = $(SNAPSHOT_STAMP) \
 	contrib/gsc/ucfggsc.c		\
 	patches/regex-3.6alpha.patch	\
 	patches/samba-largefs.patch	\
-	patches/tar-1.12.patch
+	patches/tar-1.12.patch		\
+	UPGRADING			\
+	DEVELOPING			\
+	VERSION				\
+	FULL_VERSION
 
-$(ACINCLUDE_M4): $(ACINCLUDE_M4_DEPS)
-	@-rm -f $@
-	@cat $(ACINCLUDE_M4_DEPS) > $@
+FULL_VERSION: VERSION
+	$(srcdir)/config/set_full_version $(top_srcdir)
+
+config.status: FULL_VERSION
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
+# empty out the installperms manifest file when we start
+install-exec-local: installperms-init
+install-data-local: installperms-init
+
 ## This is only meaningful for snapshots, but it won't hurt releases.
 CONFIG_STATUS = config.status
 $(CONFIG_STATUS): $(SNAPSHOT_STAMP)
@@ -86,9 +101,8 @@ lint:
 	(cd common-src; make lint)
 	(cd oldrecover-src; make lint)
 	(cd recover-src; make lint)
-	(cd restore-src; make lint)
 	(cd server-src; make lint)
-	(cd tape-src; make lint)
+	(cd xfer-src; make lint)
 
 ## Do not release the *.test.c sources.  They get built on the fly and
 ## would contain a path from the distribution machine, which will just
@@ -96,3 +110,7 @@ lint:
 
 dist-hook:
 	find $(distdir)/. -name '*.test.c' -exec rm {} \;
+
+# ensure that configure gets the right arguments for distcheck; this keeps the
+# user/group through to the distcheck, rather than defaulting back to 'amanda'.
+DISTCHECK_CONFIGURE_FLAGS = --with-user=$(CLIENT_LOGIN) --with-group=$(SETUID_GROUP) --with-owner=$(BINARY_OWNER) --disable-installperms --without-amperldir --without-force-uid --with-tmpdir=$(AMANDA_TMPDIR) SINGLE_USERID=yes CLOBBER_MY_CONFIG=OK