Imported Upstream version 3.1.0

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

diff --git a/server-src/Makefile.am b/server-src/Makefile.am
index 57363aefea9b2917d0e62e69a83e830730ff7490..867e3e3f2cb2f13c6a80d0f81a4fa68bb69a785d 100644 (file)
--- a/server-src/Makefile.am
+++ b/server-src/Makefile.am
@@ -7,9 +7,9 @@ include $(top_srcdir)/config/automake/precompile.am
 
 INCLUDES =     -I$(top_builddir)/common-src \
                -I$(top_srcdir)/common-src   \
-               -I$(top_srcdir)/restore-src  \
                -I$(top_srcdir)/amandad-src  \
                -I$(top_srcdir)/device-src   \
+               -I$(top_srcdir)/xfer-src   \
                -I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
@@ -21,35 +21,47 @@ LINTFLAGS=$(AMLINTFLAGS)
 amlib_LTLIBRARIES =    libamserver.la
 
 sbin_PROGRAMS =                amadmin         amcheck         \
-                       amflush         amlabel         \
-                       amservice       amtape          \
-                       amreport
-
-noinst_PROGRAMS = taper_source_test
+                       amflush         \
+                       amservice
 
 amlibexec_PROGRAMS =   amindexd        amlogroll       amtrmidx        \
                        amtrmlog        driver          dumper          \
-                       planner         taper           amcleanupdisk   \
+                       planner         amcleanupdisk   \
                        chunker
 
-# Exclude scripts which depend on perl extension modules from the syntax checks
-CHECK_PERL = \
+amlibexec_SCRIPTS_PERL = \
+           taper \
+           amcheck-device
+
+sbin_SCRIPTS_PERL = \
            amaddclient \
            amoverview \
            amserverconfig \
            amtoc \
-           amdevcheck \
            amcheckdump \
            amcleanup \
+           amrmtape \
+           amlabel \
+           amreport \
+           amtape \
            amvault \
            amstatus
-SCRIPTS_PERL = $(CHECK_PERL)
-SCRIPTS_SHELL = \
+if WANT_RESTORE
+amlibexec_SCRIPTS_PERL += \
+           amidxtaped
+sbin_SCRIPTS_PERL += \
+           amfetchdump \
+           amrestore
+endif
+
+sbin_SCRIPTS_SHELL = \
            amcheckdb \
-           amdump \
-           amrmtape
+           amdump
 
-sbin_SCRIPTS = $(SCRIPTS_PERL) $(SCRIPTS_SHELL)
+SCRIPTS_PERL = $(sbin_SCRIPTS_PERL) $(amlibexec_SCRIPTS_PERL)
+SCRIPTS_SHELL = $(sbin_SCRIPTS_SHELL) $(amlibexec_SCRIPTS_SHELL)
+sbin_SCRIPTS = $(sbin_SCRIPTS_PERL) $(sbin_SCRIPTS_SHELL)
+amlibexec_SCRIPTS = $(amlibexec_SCRIPTS_PERL) $(amlibexec_SCRIPTS_SHELL)
 
 INSTALLPERMS_exec = \
        dest=$(sbindir) chown=amanda chmod= \
@@ -58,6 +70,7 @@ INSTALLPERMS_exec = \
                amcheck amservice \
        dest=$(amlibexecdir) chown=amanda chmod= \
                $(amlibexec_PROGRAMS) \
+               $(amlibexec_SCRIPTS) \
        chown=root chmod=04750 \
                dumper planner
 
@@ -80,36 +93,16 @@ LDADD = ../common-src/libamanda.la   \
        ../common-src/libamanda.la   \
         $(READLINE_LIBS)
 
-libamserver_la_SOURCES=        amindex.c       changer.c                       \
+libamserver_la_SOURCES=        amindex.c       \
                        diskfile.c      driverio.c      cmdline.c  \
                        holding.c       infofile.c      logfile.c       \
                        tapefile.c      find.c          server_util.c   \
-                        taperscan.c
+                        xfer-source-holding.c
 
 libamserver_la_LDFLAGS= -release $(VERSION)
 libamserver_la_LIBADD= ../device-src/libamdevice.la \
                       ../common-src/libamanda.la
 
-taper_source_test_SOURCES = taper-source-test.c \
-                       taper-source.c \
-                       taper-file-source.c \
-                       taper-port-source.c \
-                       taper-disk-port-source.c \
-                       taper-mem-port-source.c
-
-taper_SOURCES =        taper.c \
-                       taper-source.c \
-                       taper-file-source.c \
-                       taper-port-source.c \
-                       taper-disk-port-source.c \
-                       taper-mem-port-source.c
-
-taper_LDADD = $(LDADD) \
-       ../amandad-src/libamandad.la
-
-taper_source_test_LDADD = $(LDADD) \
-       ../amandad-src/libamandad.la
-
 amindexd_LDADD = $(LDADD) \
        ../amandad-src/libamandad.la
 
@@ -123,23 +116,17 @@ CLEANFILES += *.test.c
 amindexd_CSRC =                amindexd.c      disk_history.c  list_dir.c
 amindexd_SOURCES =     disk_history.h  list_dir.h      $(amindexd_CSRC)
 
-amreport_SOURCES =     reporter.c
-
-noinst_HEADERS =       amindex.h       changer.h       cmdline.h       \
+noinst_HEADERS =       amindex.h       cmdline.h       \
                        diskfile.h      driverio.h      \
                        holding.h       infofile.h      logfile.h       \
                        tapefile.h      find.h          server_util.h   \
-                       taperscan.h taper-disk-port-source.h \
-                       taper-mem-port-source.h  taper-file-source.h \
-                       taper-port-source.h taper-source.h
+                       xfer-server.h
 
 lint:
        @ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do                   \
                p=`basename $$p $(EXEEXT)`;                                     \
                if [ $$p = "amindexd" ]; then                                   \
                        s="$(amindexd_CSRC)";                                   \
-               elif [ $$p = "amreport" ]; then                                 \
-                       s="$(amreport_SOURCES)";                                \
                else                                                            \
                        s=$$p.c;                                                \
                fi;                                                             \