X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amandad-src%2FMakefile.am;h=8b73c9cc7601b703e0f23e2a083df7dfd7b28b4f;hb=377e15b597bafb8e7c2a100f11a0166f7220fe1c;hp=f62a51e0f32624e02845801f794581396967f3ed;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/amandad-src/Makefile.am b/amandad-src/Makefile.am
index f62a51e..8b73c9c 100644
--- a/amandad-src/Makefile.am
+++ b/amandad-src/Makefile.am
@@ -1,5 +1,6 @@
 # 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
 
@@ -8,18 +9,17 @@ INCLUDES =	-I$(top_builddir)/common-src \
 		-I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
-AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
 amlib_LTLIBRARIES =       libamandad.la
-LIB_EXTENSION = la
 
 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
@@ -31,21 +31,14 @@ 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)
-
-INSTALLPERMS_exec = \
-	dest=$(amlibexecdir) chown=amanda \
-		$(amlibexec_PROGRAMS)
-
-INSTALLPERMS_data = \
-	dest=$(amlibexecdir) chown=amanda \
-		$(amlibexec_SCRIPTS)
+LDADD = ../common-src/libamanda.la \
+	libamandad.la \
+	../common-src/libamanda.la \
+	../gnulib/libgnu.la
 
 lint:
 	@ 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`;			\