Imported Upstream version 2.6.0

[debian/amanda] / amandad-src / Makefile.am

diff --git a/amandad-src/Makefile.am b/amandad-src/Makefile.am
index a673cb597195007de8b12d5fc64af3a1be1bdd91..f62a51e0f32624e02845801f794581396967f3ed 100644 (file)
--- a/amandad-src/Makefile.am
+++ b/amandad-src/Makefile.am
@@ -1,23 +1,26 @@
 # Makefile for Amanda client programs.
 
+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
 
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+
 LINT=@AMLINT@
 LINTFLAGS=@AMLINTFLAGS@
 
-lib_LTLIBRARIES =       libamandad.la
+amlib_LTLIBRARIES =       libamandad.la
 LIB_EXTENSION = la
 
-libexec_PROGRAMS =     amandad
-
-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
 
@@ -33,25 +36,23 @@ LDADD = ../common-src/libamanda.$(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
+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                                    \
                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;                                                     \