X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=recover-src%2FMakefile.am;h=ec25b9e30be179e92d3a16b47ad04cce13e51500;hb=refs%2Ftags%2Fupstream%2F2.6.1p1;hp=2dfe457161560535b710dfed0b226f3b8fef33f2;hpb=12179dea039515c06168c0037d048566a3f623de;p=debian%2Famanda

diff --git a/recover-src/Makefile.am b/recover-src/Makefile.am
index 2dfe457..ec25b9e 100644
--- a/recover-src/Makefile.am
+++ b/recover-src/Makefile.am
@@ -1,20 +1,25 @@
 # Makefile for Amanda file recovery 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)/client-src
+		-I$(top_srcdir)/client-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_EXTENSION = la
 
 sbin_PROGRAMS =		amrecover
 
-if WANT_RUNTIME_PSEUDO_RELOC
-AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc
-endif
-
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -24,9 +29,9 @@ endif
 
 LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
 	@LEXLIB@ \
+	$(READLINE_LIBS) \
 	../client-src/libamclient.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(LIB_EXTENSION) \
-	$(READLINE_LIBS)
+	../common-src/libamanda.$(LIB_EXTENSION)
 
 amrecover_CSRC =	amrecover.c					\
 			display_commands.c		extract_list.c	\
@@ -40,27 +45,18 @@ AM_YFLAGS =		-d
 
 # so that uscan.c is never generated before uparse.h
 # otherwise we might have makedepend problems
-$(srcdir)/uscan.c: $(srcdir)/uparse.h
+uscan.c: uparse.h
 
-uscan.$(OBJEXT): $(srcdir)/uscan.c
+# these two commands are specially defined to omit $(AMANDA_WARNING_CFLAGS)
+# since we don't want warnings for generated code
+uscan.$(OBJEXT): uscan.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
-uparse.$(OBJEXT): $(srcdir)/uparse.c
+uparse.$(OBJEXT): uparse.c
 	$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
 
-
-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; \
-		echo chmod o-rwx $$pa; \
-		chmod o-rwx $$pa; \
-	done
-
+INSTALLPERMS_exec = \
+	dest=$(sbindir) chown=amanda chmod=0750 $(sbin_PROGRAMS)
 
 lint:
 	@f="$(amrecover_CSRC)";							\
@@ -69,7 +65,7 @@ lint:
 	(cd ../server-src; make listlibsrc);					\
 	f="$$f "`cat ../server-src/listlibsrc.output`;				\
 	echo $(LINT) $$f;							\
-	$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config $(INCLUDES) $$f;\
+	$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config $(INCLUDES) $$f;\
 	if [ $$? -ne 0 ]; then							\
 	    exit 1;								\
 	fi;									\