lintian doesn't like orphan packages with uploaders...

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

diff --git a/common-src/Makefile.am b/common-src/Makefile.am
index 2736c656c20822310e0cd2a374d246e039395649..40e2eb63c288ad2aed4b047a945e4d21270eefa2 100644 (file)
--- a/common-src/Makefile.am
+++ b/common-src/Makefile.am
@@ -5,18 +5,21 @@ include $(top_srcdir)/config/automake/scripts.am
 include $(top_srcdir)/config/automake/installperms.am
 include $(top_srcdir)/config/automake/precompile.am
 
-INCLUDES =      -I$(top_srcdir)/gnulib   
+INCLUDES =      -I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
-AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 
 amlib_LTLIBRARIES =    libamanda.la
 
+sbin_PROGRAMS = amservice
+
 LINT=$(AMLINT)
 LINTFLAGS=$(AMLINTFLAGS)
 
 libamanda_la_SOURCES =         \
        alloc.c                 \
+       am_sl.c                 \
        amfeatures.c            \
        amflock.c               \
        ipc-binary.c            \
@@ -34,12 +37,10 @@ libamanda_la_SOURCES =              \
        packet.c                \
        pipespawn.c             \
        protocol.c              \
-       queueing.c              \
-       semaphore.c             \
+       amsemaphore.c           \
        security.c              \
        security-util.c         \
        simpleprng.c            \
-       sl.c                    \
        sockaddr-util.c         \
        stream.c                \
        tapelist.c              \
@@ -48,6 +49,12 @@ libamanda_la_SOURCES =               \
 # version.c is generated; see below
 nodist_libamanda_la_SOURCES = version.c
 
+INSTALLPERMS_exec = \
+       dest=$(sbindir) chown=root:setuid chmod=04750 \
+               amservice
+
+LDADD = libamanda.la
+
 libamanda_la_LIBADD =          \
        ../gnulib/libgnu.la
 
@@ -89,7 +96,7 @@ endif
 
 libamanda_la_SOURCES += local-security.c
 
-libamanda_la_LDFLAGS =  -release $(VERSION)
+libamanda_la_LDFLAGS =  -release $(VERSION) $(AS_NEEDED_FLAGS)
 
 noinst_HEADERS =               \
        amanda.h                \
@@ -112,12 +119,11 @@ noinst_HEADERS =          \
        packet.h                \
        pipespawn.h             \
        protocol.h              \
-       queueing.h              \
-       semaphore.h             \
+       amsemaphore.h           \
        security.h              \
        security-util.h         \
        simpleprng.h            \
-       sl.h                    \
+       am_sl.h                 \
        sockaddr-util.h         \
        stream.h                \
        tapelist.h              \
@@ -205,7 +211,7 @@ libtestutils_la_SOURCES = \
 
 # automake-style tests
 
-TESTS = amflock-test event-test semaphore-test queueing-test quoting-test \
+TESTS = amflock-test event-test amsemaphore-test quoting-test \
        ipc-binary-test hexencode-test fileheader-test match-test
 noinst_PROGRAMS = $(TESTS)
 
@@ -215,11 +221,8 @@ amflock_test_LDADD = libamanda.la libtestutils.la
 event_test_SOURCES = event-test.c
 event_test_LDADD = libamanda.la libtestutils.la
 
-semaphore_test_SOURCES = semaphore-test.c
-semaphore_test_LDADD = libamanda.la libtestutils.la
-
-queueing_test_SOURCES = queueing-test.c
-queueing_test_LDADD = libamanda.la libtestutils.la
+amsemaphore_test_SOURCES = amsemaphore-test.c
+amsemaphore_test_LDADD = libamanda.la libtestutils.la
 
 quoting_test_SOURCES = quoting-test.c
 quoting_test_LDADD = libamanda.la libtestutils.la
@@ -268,9 +271,6 @@ sbin_SCRIPTS = $(sbin_SCRIPTS_PERL) $(sbin_SCRIPTS_SHELL)
 
 # installation
 
-INSTALLPERMS_data = dest=$(sbindir) chown=amanda $(sbin_SCRIPTS) \
-                   dest=$(amlibexecdir) chown=amanda $(amlibexec_SCRIPTS) $(amlibexec_DATA)
-
 lint:
        @echo $(LINT) $(libamanda_la_SOURCES)
        @$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config $(INCLUDES) $(libamanda_la_SOURCES)