|
Check-in Number:
|
5667 | |
| Date: |
2006-Nov-20 20:52:14 (local)
2006-Nov-20 19:52:14 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Support the LDFLAGS and LIBS variables in Makefile. |
| Tickets: |
#122 | |
mm Makefile does not use LDFLAGS |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/mm/ChangeLog 1.59 -> 1.60
--- ChangeLog 2006/11/20 19:50:10 1.59
+++ ChangeLog 2006/11/20 19:52:14 1.60
@@ -11,6 +11,9 @@
Changes between 1.4.1 and 1.4.2 (10-Aug-2006 to 15-Aug-2006)
+ *) Support the LDFLAGS and LIBS variables in Makefile.
+ [Ralf S. Engelschall, Francois Laupretre <francois.laupretre@ratp.fr>]
+
*) Upgraded build environment to GNU autoconf 2.61
[Ralf S. Engelschall]
|
|
ossp-pkg/mm/Makefile.in 1.36 -> 1.37
--- Makefile.in 2006/08/10 19:07:30 1.36
+++ Makefile.in 2006/11/20 19:52:14 1.37
@@ -60,10 +60,10 @@
LIBTOOL = ./libtool
SHTOOL = ./shtool
-LIBS = libmm.la
-OBJS = mm_global.lo mm_alloc.lo mm_core.lo mm_lib.lo mm_vers.lo
-MANS = mm.3 mm-config.1
-TSTS = mm_test
+MM_LIBS = libmm.la
+MM_OBJS = mm_global.lo mm_alloc.lo mm_core.lo mm_lib.lo mm_vers.lo
+MM_MANS = mm.3 mm-config.1
+MM_TSTS = mm_test
.SUFFIXES: .o .lo
@@ -72,10 +72,10 @@
.c.lo:
$(LIBTOOL) --quiet --mode=compile $(CC) -c $(CFLAGS) $<
-all: $(LIBS) $(MANS) $(TSTS)
+all: $(MM_LIBS) $(MM_MANS) $(MM_TSTS)
-libmm.la: $(OBJS)
- $(LIBTOOL) --quiet --mode=link $(CC) -o $@ $(OBJS) \
+libmm.la: $(MM_OBJS)
+ $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -o $@ $(MM_OBJS) $(LIBS) \
-rpath $(libdir) -version-info `$(SHTOOL) version -l c -d libtool mm_vers.c`
mm_alloc.c mm_core.c mm_global.c: mm.h mm_vers.c
@@ -119,9 +119,9 @@
@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libmm.la $(DESTDIR)$(libdir)/libmm.la
clean:
- -$(RM) $(TSTS)
- -$(RM) $(OBJS)
- -$(RM) $(LIBS)
+ -$(RM) $(MM_TSTS)
+ -$(RM) $(MM_OBJS)
+ -$(RM) $(MM_LIBS)
-$(RM) core *.core *.bak *~
-$(RM) -r .libs >/dev/null 2>&1 || true
-$(RM) *.o *.lo
|
|
ossp-pkg/mm/THANKS 1.18 -> 1.19
--- THANKS 2006/06/10 07:07:54 1.18
+++ THANKS 2006/11/20 19:52:14 1.19
@@ -43,6 +43,7 @@
o Martin Kraemer <Martin.Kraemer@Fujitsu-Siemens.com>
o Sebastian Krahmer <??>
o Mike Latinovich <mlatin@boing.skysys.org>
+ o Francois Laupretre <francois.laupretre@ratp.fr>
o Rasmus Lerdorf <rasmus@lerdorf.on.ca>
o Dave Malhotra <davem@glue.umd.edu>
o Christophe Massiot <massiot@via.ecp.fr>
|
|
