projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update standards version
[debian/amanda]
/
server-src
/
Makefile.am
diff --git
a/server-src/Makefile.am
b/server-src/Makefile.am
index 867e3e3f2cb2f13c6a80d0f81a4fa68bb69a785d..4c7eabef34fe4a3fde95c74553c00bc577a71887 100644
(file)
--- a/
server-src/Makefile.am
+++ b/
server-src/Makefile.am
@@
-13,7
+13,7
@@
INCLUDES = -I$(top_builddir)/common-src \
-I$(top_srcdir)/gnulib
AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
-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)
LINT=$(AMLINT)
LINTFLAGS=$(AMLINTFLAGS)
@@
-21,15
+21,15
@@
LINTFLAGS=$(AMLINTFLAGS)
amlib_LTLIBRARIES = libamserver.la
sbin_PROGRAMS = amadmin amcheck \
amlib_LTLIBRARIES = libamserver.la
sbin_PROGRAMS = amadmin amcheck \
- amflush \
- amservice
+ amflush
-amlibexec_PROGRAMS = amindexd am
logroll am
trmidx \
+amlibexec_PROGRAMS = amindexd amtrmidx \
amtrmlog driver dumper \
amtrmlog driver dumper \
- planner amcleanupdisk \
- chunker
+ planner chunker
amlibexec_SCRIPTS_PERL = \
amlibexec_SCRIPTS_PERL = \
+ amlogroll \
+ amdumpd \
taper \
amcheck-device
taper \
amcheck-device
@@
-40,11
+40,13
@@
sbin_SCRIPTS_PERL = \
amtoc \
amcheckdump \
amcleanup \
amtoc \
amcheckdump \
amcleanup \
+ amcleanupdisk \
amrmtape \
amlabel \
amreport \
amtape \
amvault \
amrmtape \
amlabel \
amreport \
amtape \
amvault \
+ amdump \
amstatus
if WANT_RESTORE
amlibexec_SCRIPTS_PERL += \
amstatus
if WANT_RESTORE
amlibexec_SCRIPTS_PERL += \
@@
-55,8
+57,8
@@
sbin_SCRIPTS_PERL += \
endif
sbin_SCRIPTS_SHELL = \
endif
sbin_SCRIPTS_SHELL = \
- amcheckdb
\
- amdump
+ amcheckdb
+
SCRIPTS_PERL = $(sbin_SCRIPTS_PERL) $(amlibexec_SCRIPTS_PERL)
SCRIPTS_SHELL = $(sbin_SCRIPTS_SHELL) $(amlibexec_SCRIPTS_SHELL)
SCRIPTS_PERL = $(sbin_SCRIPTS_PERL) $(amlibexec_SCRIPTS_PERL)
SCRIPTS_SHELL = $(sbin_SCRIPTS_SHELL) $(amlibexec_SCRIPTS_SHELL)
@@
-64,22
+66,11
@@
sbin_SCRIPTS = $(sbin_SCRIPTS_PERL) $(sbin_SCRIPTS_SHELL)
amlibexec_SCRIPTS = $(amlibexec_SCRIPTS_PERL) $(amlibexec_SCRIPTS_SHELL)
INSTALLPERMS_exec = \
amlibexec_SCRIPTS = $(amlibexec_SCRIPTS_PERL) $(amlibexec_SCRIPTS_SHELL)
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda chmod= \
- $(sbin_PROGRAMS) \
- chown=root chmod=04750 \
- amcheck amservice \
- dest=$(amlibexecdir) chown=amanda chmod= \
- $(amlibexec_PROGRAMS) \
- $(amlibexec_SCRIPTS) \
- chown=root chmod=04750 \
+ dest=$(sbindir) chown=root:setuid chmod=04750 \
+ amcheck \
+ dest=$(amlibexecdir) \
dumper planner
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
###
# Because libamanda includes routines (e.g. regex) provided by some system
# libraries, and because of the way libtool sets up the command line, we
@@
-90,8
+81,7
@@
INSTALLPERMS_data = \
LDADD = ../common-src/libamanda.la \
libamserver.la \
../device-src/libamdevice.la \
LDADD = ../common-src/libamanda.la \
libamserver.la \
../device-src/libamdevice.la \
- ../common-src/libamanda.la \
- $(READLINE_LIBS)
+ ../common-src/libamanda.la
libamserver_la_SOURCES= amindex.c \
diskfile.c driverio.c cmdline.c \
libamserver_la_SOURCES= amindex.c \
diskfile.c driverio.c cmdline.c \
@@
-99,7
+89,7
@@
libamserver_la_SOURCES= amindex.c \
tapefile.c find.c server_util.c \
xfer-source-holding.c
tapefile.c find.c server_util.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
libamserver_la_LIBADD= ../device-src/libamdevice.la \
../common-src/libamanda.la