X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2FMakefile.am;h=1e7a7ed1e14ccec1a5eb63b16a0d7fa75a3fcbc3;hb=911bfb4415195b5c0a98b8c957caa8968313fd81;hp=0a03c66558948a7a4490fabdd0d227242dcedbab;hpb=e442edb4d5816c4ad107ad9e71164f845eba70ad;p=debian%2Famanda

diff --git a/server-src/Makefile.am b/server-src/Makefile.am
index 0a03c66..1e7a7ed 100644
--- a/server-src/Makefile.am
+++ b/server-src/Makefile.am
@@ -7,13 +7,13 @@ 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)
-AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 
 LINT=$(AMLINT)
 LINTFLAGS=$(AMLINTFLAGS)
@@ -21,54 +21,56 @@ LINTFLAGS=$(AMLINTFLAGS)
 amlib_LTLIBRARIES = 	libamserver.la
 
 sbin_PROGRAMS =		amadmin		amcheck		\
-			amflush		amgetconf	amlabel		\
-			amtape		amreport
+			amflush
 
-noinst_PROGRAMS = taper_source_test
-
-amlibexec_PROGRAMS =	amindexd	amlogroll	amtrmidx	\
+amlibexec_PROGRAMS =	amindexd	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 = \
+	    amlogroll \
+	    amdumpd \
+	    taper \
+	    amcheck-device
+
+sbin_SCRIPTS_PERL = \
 	    amaddclient \
 	    amoverview \
 	    amserverconfig \
-	    amstatus \
-	    amtoc
-SCRIPTS_PERL =  \
-	    $(CHECK_PERL) \
-	    amdevcheck \
-	    amcheckdump
-
-SCRIPTS_SHELL = \
-	    amcheckdb \
+	    amtoc \
+	    amcheckdump \
 	    amcleanup \
-	    amdump \
 	    amrmtape \
-	    amverify \
-	    amverifyrun
+	    amlabel \
+	    amreport \
+	    amtape \
+	    amvault \
+	    amdump \
+	    amstatus
+if WANT_RESTORE
+amlibexec_SCRIPTS_PERL += \
+	    amidxtaped
+sbin_SCRIPTS_PERL += \
+	    amfetchdump \
+	    amrestore
+endif
 
-sbin_SCRIPTS = $(SCRIPTS_PERL) $(SCRIPTS_SHELL)
+sbin_SCRIPTS_SHELL = \
+	    amcheckdb
+
+
+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= \
-		$(sbin_PROGRAMS) \
-	chown=root chmod=u+s,o-rwx \
+	dest=$(sbindir) chown=root:setuid chmod=04750 \
 		amcheck \
-	dest=$(amlibexecdir) chown=amanda chmod= \
-		$(amlibexec_PROGRAMS) \
-	chown=root chmod=u+s,o-rwx \
+	dest=$(amlibexecdir) \
 		dumper planner
 
-INSTALLPERMS_data = \
-	dest=$(sbindir) chown=amanda chmod= \
-		$(sbin_SCRIPTS) \
-	dest=$(amlibexecdir) chown=amanda chmod= \
-		$(amlibexec_SCRIPTS)
-
 ###
 # Because libamanda includes routines (e.g. regex) provided by some system
 # libraries, and because of the way libtool sets up the command line, we
@@ -79,40 +81,18 @@ INSTALLPERMS_data = \
 LDADD = ../common-src/libamanda.la   \
 	libamserver.la               \
 	../device-src/libamdevice.la     \
-	../common-src/libamanda.la   \
-	../gnulib/libgnu.la          \
-        $(READLINE_LIBS)
+	../common-src/libamanda.la
 
-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_LDFLAGS= -release $(VERSION) $(AS_NEEDED_FLAGS)
 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
 
@@ -126,34 +106,23 @@ 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
-
-amgetconf_SOURCES =	getconf.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)";				\
-		elif [ $$p = "amgetconf" ]; then				\
-			s="$(getconf_SOURCES)";					\
 		else								\
 			s=$$p.c;						\
 		fi; 								\
 		f="$$s $(libamserver_la_SOURCES)";				\
 		(cd ../common-src; make listlibsrc);				\
 		f="$$f "`cat ../common-src/listlibsrc.output`;			\
-		(cd ../tape-src; make listlibsrc);				\
-		f="$$f "`cat ../tape-src/listlibsrc.output`;			\
 		echo $(LINT) $$f;						\
 		$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config	\
 		    $(INCLUDES) $$f;						\