Imported Upstream version 2.6.0

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

diff --git a/restore-src/Makefile.am b/restore-src/Makefile.am
index f12bdbf199d67eadec270bb1745e33256b8858f5..fa14e255f8c95bd6e662449e034079ae600b8c6c 100644 (file)
--- a/restore-src/Makefile.am
+++ b/restore-src/Makefile.am
@@ -1,21 +1,27 @@
 # Makefile for Amanda restore 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)/tape-src     \
+               -I$(top_srcdir)/device-src   \
                -I$(top_srcdir)/server-src   \
                -I$(top_srcdir)/amandad-src  \
                -I$(top_srcdir)/gnulib
 
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+
 LINT=@AMLINT@
 LINTFLAGS=@AMLINTFLAGS@
 
-lib_LTLIBRARIES =      librestore.la
+amlib_LTLIBRARIES =    librestore.la
 LIB_EXTENSION = la
 
 sbin_PROGRAMS =        amrestore amfetchdump
 
-libexec_PROGRAMS =     amidxtaped
+amlibexec_PROGRAMS =   amidxtaped
 
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
@@ -40,31 +46,17 @@ amfetchdump_SOURCES =       amfetchdump.c
 librestore_la_SOURCES  =       restore.c
 librestore_la_LDFLAGS  =       -release $(VERSION)
 librestore_la_LIBADD   =       ../common-src/libamanda.$(LIB_EXTENSION) \
-                   ../tape-src/libamtape.$(LIB_EXTENSION) \
-                  ../server-src/libamserver.$(LIB_EXTENSION)
+                               ../server-src/libamserver.$(LIB_EXTENSION) \
+                               ../device-src/libamdevice.$(LIB_EXTENSION)
 
 noinst_HEADERS = restore.h
 
-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; \
-       done
-       @list="$(libexec_PROGRAMS)"; \
-       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=$(sbindir) chown=amanda $(sbin_PROGRAMS) \
+       dest=$(amlibexecdir) chown=amanda $(amlibexec_PROGRAMS)
 
 lint:
-       @ for p in $(libexec_PROGRAMS) $(sbin_PROGRAMS); do                     \
+       @ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do                   \
                f="$$p.c $(librestore_la_SOURCES)";                             \
                (cd ../common-src; make listlibsrc);                            \
                f="$$f "`cat ../common-src/listlibsrc.output`;                  \
@@ -73,7 +65,7 @@ lint:
                (cd ../tape-src; make listlibsrc);                              \
                f="$$f "`cat ../tape-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;                                                     \