1 diff -Nur amanda-2.4.2p2.orig/client-src/Makefile.am amanda-2.4.2p2/client-src/Makefile.am
2 --- amanda-2.4.2p2.orig/client-src/Makefile.am Tue Aug 27 09:25:46 2002
3 +++ amanda-2.4.2p2/client-src/Makefile.am Tue Aug 27 09:37:09 2002
6 INCLUDES = -I$(top_srcdir)/common-src
9 lib_LTLIBRARIES = libamclient.la
12 -noinst_LIBRARIES = libamclient.a
16 libexec_PROGRAMS = amandad calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
20 libamclient_la_LDFLAGS = -release $(VERSION)
22 -libamclient_a_SOURCES= $(libamclient_la_SOURCES)
25 # Because libamanda includes routines (e.g. regex) provided by some system
26 # libraries, and because of the way libtool sets up the command line, we
27 diff -Nur amanda-2.4.2p2.orig/common-src/Makefile.am amanda-2.4.2p2/common-src/Makefile.am
28 --- amanda-2.4.2p2.orig/common-src/Makefile.am Sat Mar 17 03:56:56 2001
29 +++ amanda-2.4.2p2/common-src/Makefile.am Tue Aug 27 09:39:10 2002
31 # Makefile for Amanda library.
34 lib_LTLIBRARIES = libamanda.la
36 -noinst_LIBRARIES = libamanda.a
40 REGsrcdir = $(srcdir)/$(REGDIR)
42 libamanda_la_LIBADD = @LTLIBOBJS@ @LTALLOCA@
43 libamanda_la_LDFLAGS = -release $(VERSION)
45 -libamanda_a_SOURCES = $(libamanda_la_SOURCES)
46 -libamanda_a_LIBADD = @LIBOBJS@ @ALLOCA@
47 +libobj_libadd = @LIBOBJS@ @ALLOCA@
49 noinst_HEADERS = amanda.h arglist.h \
53 EXTRA_PROGRAMS = genversion $(TEST_PROGS)
55 -genversion_SOURCES = genversion.c versuff.c
56 -genversion_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF)
57 +genversion_SOURCES = genversion.c
58 +genversion_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF) versuff.lo
60 genversion.o: genversion.h
61 genversion.h: $(top_builddir)/config.status
63 # used for testing only
65 statfs_SOURCES = statfs.test.c
66 -statfs_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF)
67 +statfs_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF)
69 token_SOURCES = token.test.c
70 -token_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF)
71 +token_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF)
73 file_SOURCES = file.test.c
74 -file_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF_NOT_FILE)
75 +file_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF_NOT_FILE)
77 security_SOURCES = security.test.c
78 -security_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF)
79 +security_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF)
81 %.test.c: $(srcdir)/%.c
82 echo '#define TEST' >$@
83 diff -Nur amanda-2.4.2p2.orig/server-src/Makefile.am amanda-2.4.2p2/server-src/Makefile.am
84 --- amanda-2.4.2p2.orig/server-src/Makefile.am Tue Aug 27 09:25:46 2002
85 +++ amanda-2.4.2p2/server-src/Makefile.am Tue Aug 27 09:37:09 2002
88 INCLUDES = -I$(top_srcdir)/common-src -I$(top_srcdir)/tape-src
91 lib_LTLIBRARIES = libamserver.la
94 -noinst_LIBRARIES = libamserver.a
98 sbin_PROGRAMS = amadmin amcheck amflush \
99 amgetconf amlabel amtape \
102 libamserver_la_LDFLAGS= -release $(VERSION)
104 -libamserver_a_SOURCES= $(libamserver_la_SOURCES)
107 # Because libamanda includes routines (e.g. regex) provided by some system
108 # libraries, and because of the way libtool sets up the command line, we
109 diff -Nur amanda-2.4.2p2.orig/tape-src/Makefile.am amanda-2.4.2p2/tape-src/Makefile.am
110 --- amanda-2.4.2p2.orig/tape-src/Makefile.am Tue Aug 27 09:25:46 2002
111 +++ amanda-2.4.2p2/tape-src/Makefile.am Tue Aug 27 09:37:09 2002
114 INCLUDES = -I$(top_srcdir)/common-src
117 lib_LTLIBRARIES = libamtape.la
120 -noinst_LIBRARIES = libamtape.a
124 libamtape_la_SOURCES = tapeio.c
126 libamtape_la_LDFLAGS = -release $(VERSION)
128 -libamtape_a_SOURCES = $(libamtape_la_SOURCES)
130 noinst_HEADERS = tapeio.h
132 sbin_PROGRAMS = tapetype