X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amandad-src%2FMakefile.am;h=8b73c9cc7601b703e0f23e2a083df7dfd7b28b4f;hb=66086d646c4cc92cf582b6765b315060117c6ec4;hp=a673cb597195007de8b12d5fc64af3a1be1bdd91;hpb=ac973066bc508cb82728e46eaf499e9424d4e0f1;p=debian%2Famanda

diff --git a/amandad-src/Makefile.am b/amandad-src/Makefile.am
index a673cb5..8b73c9c 100644
--- a/amandad-src/Makefile.am
+++ b/amandad-src/Makefile.am
@@ -1,23 +1,26 @@
 # Makefile for Amanda client 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)/gnulib
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 
-lib_LTLIBRARIES =       libamandad.la
-LIB_EXTENSION = la
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
-libexec_PROGRAMS =	amandad
+amlib_LTLIBRARIES =       libamandad.la
 
-if WANT_RUNTIME_PSEUDO_RELOC
-AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc
-endif
+amlibexec_PROGRAMS =	amandad
 
 libamandad_la_SOURCES= amandad_util.c
-libamandad_la_LDFLAGS = -release $(VERSION)
+libamandad_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)
+libamandad_la_LIBADD = ../common-src/libamanda.la
 
 noinst_HEADERS  = amandad.h
 
@@ -28,30 +31,21 @@ noinst_HEADERS  = amandad.h
 # routines, and second to pick up any references in the other libraries.
 ###
 
-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamandad.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(LIB_EXTENSION) \
-	../gnulib/libgnu.$(LIB_EXTENSION)
-
-install-exec-hook:
-	@list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
-	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
+LDADD = ../common-src/libamanda.la \
+	libamandad.la \
+	../common-src/libamanda.la \
+	../gnulib/libgnu.la
 
 lint:
-	@ for p in $(libexec_PROGRAMS); do					\
+	@ for p in $(amlibexec_PROGRAMS); do					\
+		p=`basename $$p $(EXEEXT)`;					\
 		f="$$p.c $(libamandad_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`;			\
 		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;							\