summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-02-06 09:56:18 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-02-06 09:56:18 +0000
commitdb9a92c4632692f930e3fb07aae7cffc99b1401e (patch)
tree7ee20babd4c5acb5017f14a76a1fff9cac7f7948
parent74502596dbe5dd9bf719f43774dd5804001368a9 (diff)
downloadrsyslog-db9a92c4632692f930e3fb07aae7cffc99b1401e.tar.gz
rsyslog-db9a92c4632692f930e3fb07aae7cffc99b1401e.tar.xz
rsyslog-db9a92c4632692f930e3fb07aae7cffc99b1401e.zip
patched makefile to support static linking (thx Bennett Todd)
-rw-r--r--NEWS4
-rw-r--r--master.make2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f5d70b7a..ed1d9f8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 1.13.2 (RGer), 2007-02-??
+- lib order in makefile patched to facilitate static linking - thanks
+ to Bennett Todd for providing the patch
+---------------------------------------------------------------------------
Version 1.13.1 (RGer), 2007-02-05
- changed the listen backlog limit to a more reasonable value based on
the maximum number of TCP connections configurd (10% + 5) - thanks to Guy
diff --git a/master.make b/master.make
index ca35481a..645af14c 100644
--- a/master.make
+++ b/master.make
@@ -42,7 +42,7 @@ test: syslog_tst tsyslogd
install: install_man install_exec
syslogd: syslogd.o pidfile.o template.o stringbuf.o srUtils.o outchannel.o parse.o
- ${CC} ${LDFLAGS} ${LZ} ${EXTRALIB} $(LPTHREAD) -o syslogd syslogd.o pidfile.o template.o outchannel.o stringbuf.o srUtils.o parse.o ${LIBS}
+ ${CC} ${LDFLAGS} $(LPTHREAD) -o syslogd syslogd.o pidfile.o template.o outchannel.o stringbuf.o srUtils.o parse.o ${LIBS} ${LZ} ${EXTRALIB}
rfc3195d: rfc3195d.o
${CC} ${LDFLAGS} -o rfc3195d rfc3195d.o ${LIBLOGGING_BIN}