projects / packages / amanda.git / blame
| Commit | Line | Data |
|---|---|---|
| 3935cf8e JB |
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 | |
| 4 | @@ -2,13 +2,8 @@ | |
| 5 | ||
| 6 | INCLUDES = -I$(top_srcdir)/common-src | |
| 7 | ||
| 8 | -if WANT_LIBTOOL | |
| 9 | lib_LTLIBRARIES = libamclient.la | |
| 10 | LIB_EXTENSION = la | |
| 11 | -else | |
| 12 | -noinst_LIBRARIES = libamclient.a | |
| 13 | -LIB_EXTENSION = a | |
| 14 | -endif | |
| 15 | ||
| 16 | libexec_PROGRAMS = amandad calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix | |
| 17 | ||
| 18 | @@ -25,8 +20,6 @@ | |
| 19 | ||
| 20 | libamclient_la_LDFLAGS = -release $(VERSION) | |
| 21 | ||
| 22 | -libamclient_a_SOURCES= $(libamclient_la_SOURCES) | |
| 23 | - | |
| 24 | ### | |
| 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 | |
| 30 | @@ -1,10 +1,6 @@ | |
| 31 | # Makefile for Amanda library. | |
| 32 | ||
| 33 | -if WANT_LIBTOOL | |
| 34 | lib_LTLIBRARIES = libamanda.la | |
| 35 | -else | |
| 36 | -noinst_LIBRARIES = libamanda.a | |
| 37 | -endif | |
| 38 | ||
| 39 | REGDIR = ../regex-src | |
| 40 | REGsrcdir = $(srcdir)/$(REGDIR) | |
| 41 | @@ -22,8 +18,7 @@ | |
| 42 | libamanda_la_LIBADD = @LTLIBOBJS@ @LTALLOCA@ | |
| 43 | libamanda_la_LDFLAGS = -release $(VERSION) | |
| 44 | ||
| 45 | -libamanda_a_SOURCES = $(libamanda_la_SOURCES) | |
| 46 | -libamanda_a_LIBADD = @LIBOBJS@ @ALLOCA@ | |
| 47 | +libobj_libadd = @LIBOBJS@ @ALLOCA@ | |
| 48 | ||
| 49 | noinst_HEADERS = amanda.h arglist.h \ | |
| 50 | dgram.h protocol.h \ | |
| 51 | @@ -48,8 +43,8 @@ | |
| 52 | ||
| 53 | EXTRA_PROGRAMS = genversion $(TEST_PROGS) | |
| 54 | ||
| 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 | |
| 59 | ||
| 60 | genversion.o: genversion.h | |
| 61 | genversion.h: $(top_builddir)/config.status | |
| 62 | @@ -97,16 +92,16 @@ | |
| 63 | # used for testing only | |
| 64 | ||
| 65 | statfs_SOURCES = statfs.test.c | |
| 66 | -statfs_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF) | |
| 67 | +statfs_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF) | |
| 68 | ||
| 69 | token_SOURCES = token.test.c | |
| 70 | -token_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF) | |
| 71 | +token_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF) | |
| 72 | ||
| 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) | |
| 76 | ||
| 77 | security_SOURCES = security.test.c | |
| 78 | -security_LDADD = $(libamanda_a_LIBADD) $(STANDARD_COMMON_STUFF) | |
| 79 | +security_LDADD = $(libobj_libadd) $(STANDARD_COMMON_STUFF) | |
| 80 | ||
| 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 | |
| 86 | @@ -2,13 +2,8 @@ | |
| 87 | ||
| 88 | INCLUDES = -I$(top_srcdir)/common-src -I$(top_srcdir)/tape-src | |
| 89 | ||
| 90 | -if WANT_LIBTOOL | |
| 91 | lib_LTLIBRARIES = libamserver.la | |
| 92 | LIB_EXTENSION = la | |
| 93 | -else | |
| 94 | -noinst_LIBRARIES = libamserver.a | |
| 95 | -LIB_EXTENSION = a | |
| 96 | -endif | |
| 97 | ||
| 98 | sbin_PROGRAMS = amadmin amcheck amflush \ | |
| 99 | amgetconf amlabel amtape \ | |
| 100 | @@ -29,8 +24,6 @@ | |
| 101 | ||
| 102 | libamserver_la_LDFLAGS= -release $(VERSION) | |
| 103 | ||
| 104 | -libamserver_a_SOURCES= $(libamserver_la_SOURCES) | |
| 105 | - | |
| 106 | ### | |
| 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 | |
| 358709f9 | 112 | @@ -2,13 +2,8 @@ |
| 3935cf8e JB |
113 | |
| 114 | INCLUDES = -I$(top_srcdir)/common-src | |
| 115 | ||
| 116 | -if WANT_LIBTOOL | |
| 117 | lib_LTLIBRARIES = libamtape.la | |
| 118 | LIB_EXTENSION = la | |
| 119 | -else | |
| 120 | -noinst_LIBRARIES = libamtape.a | |
| 121 | -LIB_EXTENSION = a | |
| 122 | -endif | |
| 123 | ||
| 358709f9 TO |
124 | sbin_PROGRAMS= ammt amdd |
| 125 | ||
| 126 | @@ -20,8 +15,6 @@ | |
| 3935cf8e JB |
127 | |
| 128 | libamtape_la_LDFLAGS = -release $(VERSION) | |
| 129 | ||
| 130 | -libamtape_a_SOURCES = $(libamtape_la_SOURCES) | |
| 131 | - | |
| 358709f9 TO |
132 | ### |
| 133 | # Because libamanda includes routines (e.g. regex) provided by some system | |
| 134 | # libraries, and because of the way libtool sets up the command line, we |