X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=restore-src%2FMakefile.am;h=26ee41521ac4cad9f372fd3f7475aa645ac501b7;hb=b6ea83cedbf3e034fa91d66a7f180f788f34f907;hp=3ca04e7b26467f5ee14b1034cdac49e38e4cec42;hpb=cdbbeef9cde260e429854dd313bc0bf7560e1e24;p=debian%2Famanda

diff --git a/restore-src/Makefile.am b/restore-src/Makefile.am
index 3ca04e7..26ee415 100644
--- a/restore-src/Makefile.am
+++ b/restore-src/Makefile.am
@@ -1,20 +1,28 @@
 # Makefile for Amanda restore programs.
 
+include $(top_srcdir)/config/automake/vars.am
+include $(top_srcdir)/config/automake/installperms.am
+include $(top_srcdir)/config/automake/precompile.am
+
 INCLUDES =	-I$(top_builddir)/common-src \
 		-I$(top_srcdir)/common-src   \
-		-I$(top_srcdir)/tape-src     \
+		-I$(top_srcdir)/device-src   \
 		-I$(top_srcdir)/server-src   \
-		-I$(top_srcdir)/amandad-src
+		-I$(top_srcdir)/amandad-src  \
+		-I$(top_srcdir)/gnulib
+
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
-lib_LTLIBRARIES =	librestore.la
+amlib_LTLIBRARIES =	librestore.la
 LIB_EXTENSION = la
 
 sbin_PROGRAMS = 	amrestore amfetchdump
 
-libexec_PROGRAMS = 	amidxtaped
+amlibexec_PROGRAMS = 	amidxtaped
 
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
@@ -27,7 +35,10 @@ LDADD = librestore.$(LIB_EXTENSION)              \
       ../common-src/libamanda.$(LIB_EXTENSION) \
       $(READLINE_LIBS)
 
-amidxtaped_LDADD = $(LDADD) ../amandad-src/libamandad.$(LIB_EXTENSION)
+amidxtaped_LDADD = $(LDADD) \
+		   ../gnulib/libgnu.$(LIB_EXTENSION) \
+		   ../amandad-src/libamandad.$(LIB_EXTENSION)
+
 amidxtaped_SOURCES = 	amidxtaped.c
 
 amfetchdump_SOURCES = 	amfetchdump.c
@@ -35,40 +46,25 @@ amfetchdump_SOURCES = 	amfetchdump.c
 librestore_la_SOURCES	=	restore.c
 librestore_la_LDFLAGS	=	-release $(VERSION)
 librestore_la_LIBADD	=	../common-src/libamanda.$(LIB_EXTENSION) \
-                   ../tape-src/libamtape.$(LIB_EXTENSION) \
-                  ../server-src/libamserver.$(LIB_EXTENSION)
+				../server-src/libamserver.$(LIB_EXTENSION) \
+				../device-src/libamdevice.$(LIB_EXTENSION)
 
 noinst_HEADERS = restore.h
 
-install-exec-hook:
-	@list="$(sbin_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
-	@list="$(libexec_PROGRAMS)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
-		echo chown $(BINARY_OWNER) $$pa; \
-		chown $(BINARY_OWNER) $$pa; \
-		echo chgrp $(SETUID_GROUP) $$pa; \
-		chgrp $(SETUID_GROUP) $$pa; \
-	done
+INSTALLPERMS_exec = \
+	dest=$(sbindir) chown=amanda $(sbin_PROGRAMS) \
+	dest=$(amlibexecdir) chown=amanda $(amlibexec_PROGRAMS)
 
 lint:
-	@ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do			\
+	@ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do			\
+		p=`basename $$p $(EXEEXT)`;					\
 		f="$$p.c $(librestore_la_SOURCES)";				\
 		(cd ../common-src; make listlibsrc);				\
 		f="$$f "`cat ../common-src/listlibsrc.output`;			\
 		(cd ../server-src; make listlibsrc);				\
 		f="$$f "`cat ../server-src/listlibsrc.output`;			\
-		(cd ../tape-src; make listlibsrc);				\
-		f="$$f "`cat ../tape-src/listlibsrc.output`;			\
 		echo $(LINT) $$f;						\
-		$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config	\
+		$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config	\
 		    $(INCLUDES) $$f;						\
 		if [ $$? -ne 0 ]; then						\
 		    exit 1;							\