Make LIBTOOL invocations explicit
Alex Kiernan
alexk at demon.net
Mon Feb 5 16:38:25 UTC 2001
To build with purify & libtool, I needed these diffs to the Makefiles
(problem is that libtool can't infer its operating mode as all it has
is `purify') - there'll be some skew patching as I've hand removed
some other changes:
Index: Makefile.global.in
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/Makefile.global.in,v
retrieving revision 1.52
diff -u -r1.52 Makefile.global.in
--- Makefile.global.in 2001/01/18 16:27:11 1.52
+++ Makefile.global.in 2001/02/05 16:35:10
@@ -69,8 +69,10 @@
EXTOBJ = @EXTOBJ@
EXTLIB = @EXTLIB@
-LIBCC = $(LIBTOOL) $(CC)
-UPLIBCC = $(UPLIBTOOL) $(CC)
+LIBCC = $(LIBTOOL) --mode=compile $(CC)
+LIBLD = $(LIBTOOL) --mode=link $(CC)
+UPLIBCC = $(UPLIBTOOL) --mode=compile $(CC)
+UPLIBLD = $(UPLIBTOOL) --mode=link $(CC)
## INN libraries. Nearly all INN programs are linked with libinn, and any
## INN program that reads from or writes to article storage or overview is
Index: authprogs/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/authprogs/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- authprogs/Makefile 2000/10/30 21:04:38 1.13
+++ authprogs/Makefile 2001/02/05 16:35:10
@@ -30,7 +30,7 @@
## Compilation rules.
-LINK = $(LIBTOOL) $(CC) $(LDFLAGS) -o $@
+LINK = $(LIBLD) $(LDFLAGS) -o $@
NEWSLIBS = $(LIBINN) $(LIBS)
ckpasswd: ckpasswd.o ; $(LINK) ckpasswd.o $(DBMLIB) $(LIBS)
Index: backends/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/backends/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- backends/Makefile 2001/01/15 13:26:33 1.34
+++ backends/Makefile 2001/02/05 16:35:10
@@ -58,7 +58,7 @@
BOTH = $(LIBSTORAGE) $(LIBINN)
-LINK = $(LIBTOOL) $(CC) $(LDFLAGS) -o $@
+LINK = $(LIBLD) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(EXTSTORAGELIBS) $(LIBS)
Index: expire/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/expire/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- expire/Makefile 2000/09/01 10:21:23 1.27
+++ expire/Makefile 2001/02/05 16:35:10
@@ -38,7 +38,7 @@
BOTH = $(LIBSTORAGE) $(LIBINN)
-LINK = $(LIBTOOL) $(CC) $(LDFLAGS) -o $@
+LINK = $(LIBLD) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(EXTSTORAGELIBS) $(LIBS)
Index: frontends/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/frontends/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- frontends/Makefile 2000/11/13 21:55:08 1.41
+++ frontends/Makefile 2001/02/05 16:35:10
@@ -52,7 +52,7 @@
BOTH = $(LIBSTORAGE) $(LIBINN)
-LINK = $(LIBTOOL) $(CC) $(LDFLAGS) -o $@
+LINK = $(LIBLD) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(EXTSTORAGELIBS) $(LIBS)
Index: innd/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/innd/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- innd/Makefile 2001/02/02 17:55:33 1.48
+++ innd/Makefile 2001/02/05 16:35:11
@@ -43,10 +43,10 @@
tcl.o: tcl.c ; $(CC) $(CFLAGS) $(TCLINC) -c tcl.c
innd: $(OBJECTS) $(LIBSTORAGE) $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
inndstart: inndstart.o $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
## Installation rules. Installation commands set in Makefile.global.
Index: innfeed/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/innfeed/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- innfeed/Makefile 2001/01/18 22:01:06 1.43
+++ innfeed/Makefile 2001/02/05 16:35:11
@@ -55,16 +55,16 @@
echo 'const char *versionInfo = "innfeed' "$$version\" ;" > $@
innfeed: $(OBJECTS) connection.o $(LIBSTORAGE) $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(OBJECTS) connection.o $(INNFEEDLIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) connection.o $(INNFEEDLIBS)
imapfeed: $(OBJECTS) imap_connection.o $(LIBSTORAGE) $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(OBJECTS) imap_connection.o $(INNFEEDLIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) imap_connection.o $(INNFEEDLIBS)
procbatch: procbatch.in $(FIXSCRIPT)
$(FIXSCRIPT) procbatch.in
startinnfeed: startinnfeed.o $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
# Not normally built.
innfeed-convcfg: innfeed-convcfg.in $(FIXSCRIPT)
Index: lib/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/lib/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- lib/Makefile 2000/12/21 03:54:48 1.64
+++ lib/Makefile 2001/02/05 16:35:11
@@ -39,7 +40,7 @@
$(CTAGS) $(SOURCES) ../include/*.h
libinn.la: $(OBJECTS) $(LOBJECTS)
- $(LIBCC) $(LDFLAGS) -o $@ $(LOBJECTS) \
+ $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
-rpath $(PATHLIB) -version-info 2:0:0
libinn.a: $(OBJECTS)
Index: nnrpd/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/nnrpd/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- nnrpd/Makefile 2000/09/01 10:28:26 1.34
+++ nnrpd/Makefile 2001/02/05 16:35:11
@@ -38,7 +38,7 @@
python.o: python.c ; $(CC) $(CFLAGS) $(PYTHONINC) -c python.c
nnrpd: $(OBJECTS) $(LIBSTORAGE) $(LIBINN)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(NNRPDLIBS)
+ $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(NNRPDLIBS)
## Installation rules. Installation commands set in Makefile.global.
Index: storage/Makefile
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/storage/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- storage/Makefile 2000/09/01 10:30:12 1.47
+++ storage/Makefile 2001/02/05 16:35:11
@@ -37,7 +37,7 @@
$(CTAGS) $(SOURCES) ../include/*.h
libstorage.la: $(P) $(OBJECTS) $(LOBJECTS) $(LSM_OBJECTS) $(LOV_OBJECTS)
- $(LIBCC) $(LDFLAGS) -o libstorage.la $(LOBJECTS) $(LSM_OBJECTS) $(LOV_OBJECTS) \
+ $(LIBLD) $(LDFLAGS) -o libstorage.la $(LOBJECTS) $(LSM_OBJECTS) $(LOV_OBJECTS) \
-rpath $(PATHLIB) -version-info 2:0:0
libstorage.a: $(P) $(OBJECTS) $(SM_OBJECTS) $(OV_OBJECTS)
--
Alex Kiernan, Principal Engineer, Development, Thus PLC
More information about the inn-patches
mailing list