X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amandad-src%2FMakefile.am;h=768d0bbc26184284d2a9d0ff6909a17844eec2cd;hb=ae82bdf8b1748623ea97a99d3a2c76d36ee573af;hp=3411292a1cf52ab962fc0664ca152856594e38a3;hpb=12179dea039515c06168c0037d048566a3f623de;p=debian%2Famanda

diff --git a/amandad-src/Makefile.am b/amandad-src/Makefile.am
index 3411292..768d0bb 100644
--- a/amandad-src/Makefile.am
+++ b/amandad-src/Makefile.am
@@ -1,22 +1,27 @@
 # 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)/common-src \
+		-I$(top_srcdir)/gnulib
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
 
-lib_LTLIBRARIES =       libamandad.la
-LIB_EXTENSION = la
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
-libexec_PROGRAMS =	amandad
+amlib_LTLIBRARIES =       libamandad.la
+LIB_EXTENSION = 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_LIBADD = ../common-src/libamanda.la
 
 noinst_HEADERS  = amandad.h
 
@@ -29,27 +34,27 @@ noinst_HEADERS  = amandad.h
 
 LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
 	libamandad.$(LIB_EXTENSION) \
-	../common-src/libamanda.$(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
+	../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)
 
 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;							\