Only link needed shared libraries.

Enable additional compiler warnings.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5268 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

7 files changed, 20 insertions, 16 deletions

diff --git a/pttbbs/daemon/angelbeats/Makefile b/pttbbs/daemon/angelbeats/Makefile
index 8667abab..435b9625 100644
--- a/pttbbs/daemon/angelbeats/Makefile
+++ b/pttbbs/daemon/angelbeats/Makefile
@@ -9,7 +9,8 @@ UTILOBJ=	$(UTILDIR)/util_var.o
 
 LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \
 	$(SRCROOT)/common/sys/libcmsys.a \
-	$(SRCROOT)/common/osdep/libosdep.a
+	$(SRCROOT)/common/osdep/libosdep.a \
+	-levent
 
 all:	${PROGRAMS}
 
@@ -20,10 +21,10 @@ all:	${PROGRAMS}
 	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 angelbeats: angelbeats.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(UTILOBJ) $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(UTILOBJ) $(LDLIBS)
 
 abc: abc.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(UTILOBJ) $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(UTILOBJ) $(LDLIBS)
 
 install: $(PROGS)
 	install -d $(BBSHOME)/bin/
diff --git a/pttbbs/daemon/bpop3d/Makefile b/pttbbs/daemon/bpop3d/Makefile
index f523b88f..7fe4684c 100644
--- a/pttbbs/daemon/bpop3d/Makefile
+++ b/pttbbs/daemon/bpop3d/Makefile
@@ -8,7 +8,8 @@ UTILOBJ=	$(UTILDIR)/util_var.o
 
 LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \
 	$(SRCROOT)/common/sys/libcmsys.a \
-	$(SRCROOT)/common/osdep/libosdep.a
+	$(SRCROOT)/common/osdep/libosdep.a \
+	-lcrypt -levent
 
 all:	${PROGRAMS}
 
@@ -19,7 +20,7 @@ all:	${PROGRAMS}
 	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 bpop3d: bpop3d.o $(UTILOBJ)
-	${CC} ${CFLAGS} ${LDFLAGS} -lcrypt -levent -o $* $> $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $* $> $(LDLIBS)
 
 clean:
 	rm -f *~ ${PROGRAMS} bpop3d.o
diff --git a/pttbbs/daemon/fromd/Makefile b/pttbbs/daemon/fromd/Makefile
index 6584d0ec..dc17dbde 100644
--- a/pttbbs/daemon/fromd/Makefile
+++ b/pttbbs/daemon/fromd/Makefile
@@ -16,7 +16,7 @@ all:	${PROGRAMS}
 	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 fromd: fromd.o ip_desc_db.o
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(LDLIBS) -levent
 
 fromc: fromc.o
 	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(LDLIBS)
diff --git a/pttbbs/daemon/logind/Makefile b/pttbbs/daemon/logind/Makefile
index 9e7fa093..95a28f61 100644
--- a/pttbbs/daemon/logind/Makefile
+++ b/pttbbs/daemon/logind/Makefile
@@ -9,7 +9,8 @@ UTILOBJ=	$(UTILDIR)/util_var.o
 
 LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \
 	$(SRCROOT)/common/sys/libcmsys.a \
-	$(SRCROOT)/common/osdep/libosdep.a
+	$(SRCROOT)/common/osdep/libosdep.a \
+	-levent
 
 all:	${PROGRAMS}
 
@@ -20,10 +21,10 @@ all:	${PROGRAMS}
 	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 logind: logind.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(UTILOBJ) $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(UTILOBJ) $(LDLIBS)
 
 loginc: loginc.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(LDLIBS)
 
 install: $(PROGS)
 	install -d $(BBSHOME)/bin/
diff --git a/pttbbs/daemon/regmaild/Makefile b/pttbbs/daemon/regmaild/Makefile
index 81891121..c6e8b719 100644
--- a/pttbbs/daemon/regmaild/Makefile
+++ b/pttbbs/daemon/regmaild/Makefile
@@ -10,6 +10,7 @@ UTILOBJ=	$(UTILDIR)/util_var.o
 LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \
 	$(SRCROOT)/common/sys/libcmsys.a \
 	$(SRCROOT)/common/osdep/libosdep.a \
+	-levent \
 	-lsqlite3
 
 all:	${PROGRAMS}
@@ -21,10 +22,10 @@ all:	${PROGRAMS}
 	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 regmaild: regmaild.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(UTILOBJ) $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(UTILOBJ) $(LDLIBS)
 
 regmailc: regmailc.o 
-	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $> $(LDLIBS)
 
 install: $(PROGS)
 	install -d $(BBSHOME)/bin/
diff --git a/pttbbs/daemon/utmpd/Makefile b/pttbbs/daemon/utmpd/Makefile
index f033e984..cee4267e 100644
--- a/pttbbs/daemon/utmpd/Makefile
+++ b/pttbbs/daemon/utmpd/Makefile
@@ -23,12 +23,12 @@ utmpserver: utmpserver.o
 utmpserver2: utmpserver2.o friend.o
 	${CXX} ${CFLAGS} ${LDFLAGS} -o $* $*.o friend.o $(LDLIBS)
 utmpserver3: utmpserver3.o friend.o
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -levent -o $* $*.o friend.o $(LDLIBS)
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $* $*.o friend.o $(LDLIBS) -levent
 utmpsync: utmpsync.o $(UTILOBJ)
 	${CC} ${CFLAGS} ${LDFLAGS} -o $* $*.o $(UTILOBJ) $(LDLIBS)
 
 authserver: authserver.o
-	${CC} ${CFLAGS} ${LDFLAGS} -lcrypt -levent -o $* $> $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o $* $> $(LDLIBS) -lcrypt -levent
 
 clean:
 	rm -f *~ ${PROGRAMS} friend.o utmpserver.o utmpserver2.o utmpserver3.o utmpsync.o authserver.o
diff --git a/pttbbs/pttbbs.mk b/pttbbs/pttbbs.mk
index 84c6e3b7..b3aef2c4 100644
--- a/pttbbs/pttbbs.mk
+++ b/pttbbs/pttbbs.mk
@@ -17,9 +17,9 @@ CC:=		ccache $(CC)
 CXX:=		ccache $(CXX)
 .endif
 
-PTT_CFLAGS:=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
-PTT_CXXFLAGS:=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
-PTT_LDFLAGS:=
+PTT_CFLAGS:=	-W -Wall -Wunused -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
+PTT_CXXFLAGS:=	-W -Wall -Wunused -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
+PTT_LDFLAGS:=	-Wl,--as-needed
 .if $(WANTS_CONVERT) != "NO"
 PTT_LDLIBS+=	-lhz
 .endif