On Mon, Nov 22, 2010 at 10:09:40PM -0500, Victor Duchovni wrote:
> diff -Nru postfix0/makedefs postfix/makedefs
...
> + SHLIB_LDFLAGS='-h $(SONAME)'
Or rather '-Wl,-h,$(SONAME)'. A more complete, but still partial
conversion of (just) libutil to a shared library is attached. This
variant still has no '-Wl,-R,${INSTALL_SHLIB_DIR}' rpath flags
needed to make the resulting Postfix usable when installed in
the compiled-in location. So this is just a demo, but the idea
should be clear enough.
There is plenty of room for polish, but none of this rocket science,
just some tedious wacking of the library and program Makefile after
making some naming and style choices.
Running:
$ LD_LIBRARY_PATH=$PWD/lib ldd libexec/smtpd
Yields the output below, showing "libpostfix-util.so.2.8" used as
expected.
libpostfix-util.so.2.8 => /tmp/postfix/lib/libpostfix-util.so.2.8
(0x0000002a9566c000)
libpcre.so.0 => /lib64/libpcre.so.0 (0x0000002a957c4000)
libdb-4.2.so => /lib64/tls/libdb-4.2.so (0x000000314c100000)
libnsl.so.1 => /lib64/libnsl.so.1 (0x0000002a958d3000)
libresolv.so.2 => /lib64/libresolv.so.2 (0x0000002a959eb000)
libc.so.6 => /lib64/tls/libc.so.6 (0x0000002a95b00000)
libpthread.so.0 => /lib64/tls/libpthread.so.0 (0x0000002a95d35000)
/lib64/ld-linux-x86-64.so.2 (0x0000002a95556000)
--
Viktor.
diff -Nru postfix0/makedefs postfix/makedefs
--- postfix0/makedefs 2010-09-13 16:42:45.000000000 -0400
+++ postfix/makedefs 2010-11-22 23:15:32.000000000 -0500
@@ -256,6 +256,12 @@
;;
Linux.2*) SYSTYPE=LINUX2
# Postfix no longer needs DB 1.85 compatibility
+ SHLIB_LD='gcc -shared'
+ SHLIB_LDFLAGS='-Wl,-h,$(SONAME)'
+ SHLIB_CFLAGS='-fPIC'
+ SHLIB_EXT='so'
+ LIB_TARGET='$(SOLIB)'
+ PF_SHLIB_VERSION=2.8
if [ -f /usr/include/db.h ]
then
: we are all set
@@ -634,4 +640,10 @@
STRCASE = $STRCASE
EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
WARN = $WARN
+SHLIB_LD = $SHLIB_LD
+SHLIB_LDFLAGS = $SHLIB_LDFLAGS
+SHLIB_CFLAGS = $SHLIB_CFLAGS
+SHLIB_EXT = $SHLIB_EXT
+LIB_TARGET = $LIB_TARGET
+PF_SHLIB_VERSION = $PF_SHLIB_VERSION
EOF
diff -Nru postfix0/src/anvil/Makefile.in postfix/src/anvil/Makefile.in
--- postfix0/src/anvil/Makefile.in 2010-02-06 02:34:29.000000000 -0500
+++ postfix/src/anvil/Makefile.in 2010-11-22 23:08:20.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = anvil
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/bounce/Makefile.in postfix/src/bounce/Makefile.in
--- postfix0/src/bounce/Makefile.in 2010-02-06 02:34:30.000000000 -0500
+++ postfix/src/bounce/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -15,14 +15,15 @@
PROG = bounce
SAMPLES = ../../conf/bounce.cf.default
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
all: $(PROG) ../../conf/bounce.cf.default
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
# Eliminate dependency on installed Postfix.
../../conf/bounce.cf.default: template_test.ref annotate.pl
diff -Nru postfix0/src/cleanup/Makefile.in postfix/src/cleanup/Makefile.in
--- postfix0/src/cleanup/Makefile.in 2010-11-04 16:52:15.000000000 -0400
+++ postfix/src/cleanup/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -19,12 +19,13 @@
PROG = cleanup
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \
- ../../lib/libutil.a
+ ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lmilter -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/discard/Makefile.in postfix/src/discard/Makefile.in
--- postfix0/src/discard/Makefile.in 2010-02-06 02:34:38.000000000 -0500
+++ postfix/src/discard/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = discard
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/dns/Makefile.in postfix/src/dns/Makefile.in
--- postfix0/src/dns/Makefile.in 2010-02-06 02:34:38.000000000 -0500
+++ postfix/src/dns/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -10,7 +10,8 @@
INCL =
LIB = libdns.a
TESTPROG= test_dns_lookup dns_rr_to_pa dns_rr_to_sa dns_sa_to_rr dns_rr_eq_sa
-LIBS = ../../lib/libutil.a
+LIBS = ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lutil
LIB_DIR = ../../lib
INC_DIR = ../../include
@@ -46,7 +47,7 @@
cd $(INC_DIR); chmod 644 $(HDRS)
test_dns_lookup: test_dns_lookup.c $(LIB) $(LIBS)
- $(CC) $(CFLAGS) -o $@ [email protected] $(LIB) $(LIBS) $(SYSLIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ [email protected] $(LIB_TARGET) $(SYSLIBS)
dns_rr_to_pa: $(LIB) $(LIBS)
mv [email protected] junk
@@ -55,17 +56,17 @@
dns_rr_to_sa: $(LIB) $(LIBS)
mv [email protected] junk
- $(CC) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB) $(LIBS) $(SYSLIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB_TARGET) $(SYSLIBS)
mv junk [email protected]
dns_sa_to_rr: $(LIB) $(LIBS)
mv [email protected] junk
- $(CC) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB) $(LIBS) $(SYSLIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB_TARGET) $(SYSLIBS)
mv junk [email protected]
dns_rr_eq_sa: $(LIB) $(LIBS)
mv [email protected] junk
- $(CC) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB) $(LIBS) $(SYSLIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ [email protected] $(LIB_TARGET) $(SYSLIBS)
mv junk [email protected]
dns_rr_to_pa_test: dns_rr_to_pa dns_rr_to_pa.in dns_rr_to_pa.ref
diff -Nru postfix0/src/dnsblog/Makefile.in postfix/src/dnsblog/Makefile.in
--- postfix0/src/dnsblog/Makefile.in 2010-02-06 02:34:39.000000000 -0500
+++ postfix/src/dnsblog/Makefile.in 2010-11-22 23:12:02.000000000 -0500
@@ -9,12 +9,13 @@
PROG = dnsblog
INC_DIR = ../../include
LIBS = ../../lib/libdns.a ../../lib/libmaster.a ../../lib/libglobal.a \
- ../../lib/libutil.a
+ ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -ldns -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/error/Makefile.in postfix/src/error/Makefile.in
--- postfix0/src/error/Makefile.in 2010-02-06 02:34:39.000000000 -0500
+++ postfix/src/error/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = error
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/flush/Makefile.in postfix/src/flush/Makefile.in
--- postfix0/src/flush/Makefile.in 2010-02-06 02:34:40.000000000 -0500
+++ postfix/src/flush/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = flush
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/fsstone/Makefile.in postfix/src/fsstone/Makefile.in
--- postfix0/src/fsstone/Makefile.in 2010-02-06 02:34:40.000000000 -0500
+++ postfix/src/fsstone/Makefile.in 2010-11-22 23:05:11.000000000 -0500
@@ -8,7 +8,8 @@
TESTPROG=
PROG = fsstone
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
@@ -20,7 +21,7 @@
cat ../../conf/makedefs.out $? >$@
fsstone: fsstone.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ fsstone.o $(LDFLAGS) $(SYSLIBS)
test: $(TESTPROG)
diff -Nru postfix0/src/global/Makefile.in postfix/src/global/Makefile.in
--- postfix0/src/global/Makefile.in 2010-09-13 16:41:15.000000000 -0400
+++ postfix/src/global/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -100,7 +100,7 @@
valid_mailhost_addr own_inet_addr header_body_checks \
data_redirect
-LIBS = ../../lib/libutil.a
+LIBS = ../../lib/libutil.${SHLIB_EXT}
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
diff -Nru postfix0/src/local/Makefile.in postfix/src/local/Makefile.in
--- postfix0/src/local/Makefile.in 2010-02-24 14:34:00.000000000 -0500
+++ postfix/src/local/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -14,12 +14,13 @@
PROG = local
TESTPROG=
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/master/Makefile.in postfix/src/master/Makefile.in
--- postfix0/src/master/Makefile.in 2010-02-06 02:34:55.000000000 -0500
+++ postfix/src/master/Makefile.in 2010-11-22 22:25:56.000000000 -0500
@@ -15,7 +15,7 @@
LIB = libmaster.a
PROG = master
TESTPROG=
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.so
LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
diff -Nru postfix0/src/milter/Makefile.in postfix/src/milter/Makefile.in
--- postfix0/src/milter/Makefile.in 2010-02-06 02:34:57.000000000 -0500
+++ postfix/src/milter/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -9,7 +9,8 @@
LIB = libmilter.a
TESTPROG= milter test-milter
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
diff -Nru postfix0/src/oqmgr/Makefile.in postfix/src/oqmgr/Makefile.in
--- postfix0/src/oqmgr/Makefile.in 2010-02-06 02:34:57.000000000 -0500
+++ postfix/src/oqmgr/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -14,12 +14,13 @@
TESTPROG=
PROG = qmgr
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/pickup/Makefile.in postfix/src/pickup/Makefile.in
--- postfix0/src/pickup/Makefile.in 2010-02-06 02:34:58.000000000 -0500
+++ postfix/src/pickup/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = pickup
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/pipe/Makefile.in postfix/src/pipe/Makefile.in
--- postfix0/src/pipe/Makefile.in 2010-02-06 02:34:58.000000000 -0500
+++ postfix/src/pipe/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = pipe
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postalias/Makefile.in postfix/src/postalias/Makefile.in
--- postfix0/src/postalias/Makefile.in 2010-02-06 02:34:58.000000000 -0500
+++ postfix/src/postalias/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postalias
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postcat/Makefile.in postfix/src/postcat/Makefile.in
--- postfix0/src/postcat/Makefile.in 2010-02-06 02:34:59.000000000 -0500
+++ postfix/src/postcat/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postcat
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postconf/Makefile.in postfix/src/postconf/Makefile.in
--- postfix0/src/postconf/Makefile.in 2010-09-13 16:41:42.000000000 -0400
+++ postfix/src/postconf/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -14,12 +14,13 @@
PROG = postconf
SAMPLES = ../../conf/main.cf.default
INC_DIR = ../../include
-LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lxsasl -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
../../conf/main.cf.default: $(PROG) Makefile
rm -f $@
diff -Nru postfix0/src/postdrop/Makefile.in postfix/src/postdrop/Makefile.in
--- postfix0/src/postdrop/Makefile.in 2010-02-06 02:35:00.000000000 -0500
+++ postfix/src/postdrop/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postdrop
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postfix/Makefile.in postfix/src/postfix/Makefile.in
--- postfix0/src/postfix/Makefile.in 2010-02-06 02:35:00.000000000 -0500
+++ postfix/src/postfix/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -9,12 +9,13 @@
INC_DIR = ../../include
TESTPROG=
PROG = postfix
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postkick/Makefile.in postfix/src/postkick/Makefile.in
--- postfix0/src/postkick/Makefile.in 2010-02-06 02:35:01.000000000 -0500
+++ postfix/src/postkick/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postkick
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postlock/Makefile.in postfix/src/postlock/Makefile.in
--- postfix0/src/postlock/Makefile.in 2010-02-06 02:35:01.000000000 -0500
+++ postfix/src/postlock/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postlock
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postlog/Makefile.in postfix/src/postlog/Makefile.in
--- postfix0/src/postlog/Makefile.in 2010-02-06 02:35:01.000000000 -0500
+++ postfix/src/postlog/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -9,12 +9,13 @@
INC_DIR = ../../include
TESTPROG=
PROG = postlog
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postmap/Makefile.in postfix/src/postmap/Makefile.in
--- postfix0/src/postmap/Makefile.in 2010-02-06 02:35:01.000000000 -0500
+++ postfix/src/postmap/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postmap
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postmulti/Makefile.in postfix/src/postmulti/Makefile.in
--- postfix0/src/postmulti/Makefile.in 2010-02-06 02:35:01.000000000 -0500
+++ postfix/src/postmulti/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -9,12 +9,13 @@
INC_DIR = ../../include
TESTPROG=
PROG = postmulti
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postqueue/Makefile.in postfix/src/postqueue/Makefile.in
--- postfix0/src/postqueue/Makefile.in 2010-02-06 02:35:02.000000000 -0500
+++ postfix/src/postqueue/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postqueue
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postscreen/Makefile.in postfix/src/postscreen/Makefile.in
--- postfix0/src/postscreen/Makefile.in 2010-09-13 16:41:45.000000000 -0400
+++ postfix/src/postscreen/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -12,12 +12,13 @@
TESTPROG=
PROG = postscreen
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/postsuper/Makefile.in postfix/src/postsuper/Makefile.in
--- postfix0/src/postsuper/Makefile.in 2010-02-06 02:35:03.000000000 -0500
+++ postfix/src/postsuper/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = postsuper
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/proxymap/Makefile.in postfix/src/proxymap/Makefile.in
--- postfix0/src/proxymap/Makefile.in 2010-02-06 02:35:03.000000000 -0500
+++ postfix/src/proxymap/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = proxymap
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/qmgr/Makefile.in postfix/src/qmgr/Makefile.in
--- postfix0/src/qmgr/Makefile.in 2010-02-06 02:35:03.000000000 -0500
+++ postfix/src/qmgr/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -16,12 +16,13 @@
TESTPROG=
PROG = qmgr
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/qmqpd/Makefile.in postfix/src/qmqpd/Makefile.in
--- postfix0/src/qmqpd/Makefile.in 2010-02-06 02:35:03.000000000 -0500
+++ postfix/src/qmqpd/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = qmqpd
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a
../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -ldns -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/scache/Makefile.in postfix/src/scache/Makefile.in
--- postfix0/src/scache/Makefile.in 2010-02-06 02:35:04.000000000 -0500
+++ postfix/src/scache/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = scache
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/sendmail/Makefile.in postfix/src/sendmail/Makefile.in
--- postfix0/src/sendmail/Makefile.in 2010-02-06 02:35:04.000000000 -0500
+++ postfix/src/sendmail/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = sendmail
INC_DIR = ../../include
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/showq/Makefile.in postfix/src/showq/Makefile.in
--- postfix0/src/showq/Makefile.in 2010-02-06 02:35:04.000000000 -0500
+++ postfix/src/showq/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = showq
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/smtp/Makefile.in postfix/src/smtp/Makefile.in
--- postfix0/src/smtp/Makefile.in 2010-08-30 10:29:48.000000000 -0400
+++ postfix/src/smtp/Makefile.in 2010-11-22 23:11:22.000000000 -0500
@@ -15,12 +15,13 @@
PROG = smtp
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
- ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
+ ../../lib/libxsasl.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -ltls -ldns -lxsasl -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/smtpd/Makefile.in postfix/src/smtpd/Makefile.in
--- postfix0/src/smtpd/Makefile.in 2010-11-08 20:14:49.000000000 -0500
+++ postfix/src/smtpd/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -16,12 +16,13 @@
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \
- ../../lib/libutil.a
+ ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -ltls -ldns -lxsasl -lmilter -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/smtpstone/Makefile.in postfix/src/smtpstone/Makefile.in
--- postfix0/src/smtpstone/Makefile.in 2010-02-06 02:35:07.000000000 -0500
+++ postfix/src/smtpstone/Makefile.in 2010-11-22 23:10:31.000000000 -0500
@@ -8,7 +8,8 @@
TESTPROG=
INC_DIR = ../../include
PROG = smtp-source smtp-sink qmqp-source qmqp-sink
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
@@ -20,16 +21,16 @@
cat ../../conf/makedefs.out $? >$@
smtp-sink: smtp-sink.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LDFLAGS) $(SYSLIBS)
smtp-source: smtp-source.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ smtp-source.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ smtp-source.o $(LDFLAGS) $(SYSLIBS)
qmqp-sink: qmqp-sink.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ qmqp-sink.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ qmqp-sink.o $(LDFLAGS) $(SYSLIBS)
qmqp-source: qmqp-source.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ qmqp-source.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ qmqp-source.o $(LDFLAGS) $(SYSLIBS)
test: $(TESTPROG)
diff -Nru postfix0/src/spawn/Makefile.in postfix/src/spawn/Makefile.in
--- postfix0/src/spawn/Makefile.in 2010-02-06 02:35:08.000000000 -0500
+++ postfix/src/spawn/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = spawn
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/tls/Makefile.in postfix/src/tls/Makefile.in
--- postfix0/src/tls/Makefile.in 2010-06-12 00:19:47.000000000 -0400
+++ postfix/src/tls/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -17,7 +17,7 @@
LIB = libtls.a
TESTPROG= tls_dh tls_mgr
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
diff -Nru postfix0/src/tlsmgr/Makefile.in postfix/src/tlsmgr/Makefile.in
--- postfix0/src/tlsmgr/Makefile.in 2010-02-06 02:35:08.000000000 -0500
+++ postfix/src/tlsmgr/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -9,12 +9,13 @@
PROG = tlsmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libglobal.a \
- ../../lib/libutil.a
+ ../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -ltls -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/trivial-rewrite/Makefile.in
postfix/src/trivial-rewrite/Makefile.in
--- postfix0/src/trivial-rewrite/Makefile.in 2010-02-06 02:35:08.000000000
-0500
+++ postfix/src/trivial-rewrite/Makefile.in 2010-11-22 23:04:19.000000000
-0500
@@ -8,7 +8,8 @@
LIB =
TESTPROG=
PROG = trivial-rewrite
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
@@ -18,7 +19,7 @@
all: $(PROG) $(LIB)
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/util/Makefile.in postfix/src/util/Makefile.in
--- postfix0/src/util/Makefile.in 2010-09-13 16:41:58.000000000 -0400
+++ postfix/src/util/Makefile.in 2010-11-22 21:49:35.000000000 -0500
@@ -93,7 +93,10 @@
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
-LIB = libutil.a
+LIBNAME = util
+LIB = lib${LIBNAME}.a
+SOLIB = lib${LIBNAME}.${SHLIB_EXT}
+SONAME = libpostfix-${LIBNAME}.${SHLIB_EXT}.${PF_SHLIB_VERSION}
TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
inet_addr_host inet_addr_local mac_parse make_dirs msg_syslog \
@@ -109,9 +112,9 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
-.c.o:; $(CC) $(CFLAGS) -c $*.c
+.c.o:; $(CC) $(SHLIB_CFLAGS) $(CFLAGS) -c $*.c
-all: $(LIB)
+all: $(LIB_TARGET)
$(OBJS): ../../conf/makedefs.out
@@ -121,14 +124,22 @@
test: $(TESTPROG)
$(LIB): $(OBJS)
- $(AR) $(ARFL) $(LIB) $?
+ $(SHLIB_AR) $(ARFL) $(LIB) $?
$(RANLIB) $(LIB)
+$(SOLIB): $(OBJS)
+ $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $(SONAME) $?
+ rm -f $(SOLIB); ln -s $(SONAME) $(SOLIB)
+
$(LIB_DIR)/$(LIB): $(LIB)
cp $(LIB) $(LIB_DIR)
$(RANLIB) $(LIB_DIR)/$(LIB)
-update: $(LIB_DIR)/$(LIB) $(HDRS)
+$(LIB_DIR)/$(SOLIB): $(SOLIB)
+ cp $(SONAME) $(LIB_DIR)
+ rm -f $(LIB_DIR)/$(SOLIB); ln -s $(SONAME) $(LIB_DIR)/$(SOLIB)
+
+update: $(LIB_DIR)/$(LIB_TARGET) $(HDRS)
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -150,7 +161,7 @@
lint $(SRCS)
clean:
- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
+ rm -f *.o $(LIB) $(SOLIB) $(SONAME) *core $(TESTPROG) junk $(MAKES)
*.tmp
rm -rf printfck
tidy: clean
diff -Nru postfix0/src/verify/Makefile.in postfix/src/verify/Makefile.in
--- postfix0/src/verify/Makefile.in 2010-02-06 02:35:18.000000000 -0500
+++ postfix/src/verify/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
TESTPROG=
PROG = verify
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/virtual/Makefile.in postfix/src/virtual/Makefile.in
--- postfix0/src/virtual/Makefile.in 2010-02-06 02:35:18.000000000 -0500
+++ postfix/src/virtual/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -8,12 +8,13 @@
PROG = virtual
TESTPROG=
INC_DIR = ../../include
-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libmaster.a ../../lib/libglobal.a
../../lib/libutil.${SHLIB_EXT}
+LDFLAGS = -L../../lib -lmaster -lglobal -lutil
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(SYSLIBS)
$(OBJS): ../../conf/makedefs.out
diff -Nru postfix0/src/xsasl/Makefile.in postfix/src/xsasl/Makefile.in
--- postfix0/src/xsasl/Makefile.in 2010-02-06 02:35:18.000000000 -0500
+++ postfix/src/xsasl/Makefile.in 2010-11-22 23:04:19.000000000 -0500
@@ -13,7 +13,7 @@
LIB = libxsasl.a
TESTPROG=
-LIBS = ../../lib/libglobal.a ../../lib/libutil.a
+LIBS = ../../lib/libglobal.a ../../lib/libutil.${SHLIB_EXT}
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
