From 786727eecdf6ca83cbd92383a8466911068f7a9d Mon Sep 17 00:00:00 2001
From: wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 25 Jun 2011 10:29:11 +0000
Subject: Move common settings to master makefile

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5358 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/daemon/boardd/Makefile | 5 -----
 pttbbs/pttbbs.mk              | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pttbbs/daemon/boardd/Makefile b/pttbbs/daemon/boardd/Makefile
index 4cd5ac3d..de660f88 100644
--- a/pttbbs/daemon/boardd/Makefile
+++ b/pttbbs/daemon/boardd/Makefile
@@ -6,14 +6,9 @@ SRCROOT=	../..
 PROG=	boardd
 SRCS=	boardd.c server.c
 
-CLEANFILES+=	*~
 UTILDIR=	$(SRCROOT)/util
 UTILOBJ=	$(UTILDIR)/util_var.o
 
-LIBEVENT_CFLAGS!=	pkg-config --cflags libevent
-LIBEVENT_LIBS_L!=	pkg-config --libs-only-L libevent
-LIBEVENT_LIBS_l!=	pkg-config --libs-only-l libevent
-
 CFLAGS+=	$(LIBEVENT_CFLAGS)
 LDFLAGS+=	$(LIBEVENT_LIBS_L)
 
diff --git a/pttbbs/pttbbs.mk b/pttbbs/pttbbs.mk
index cb4ce2b9..1ddc4c95 100644
--- a/pttbbs/pttbbs.mk
+++ b/pttbbs/pttbbs.mk
@@ -73,6 +73,7 @@ CXXFLAGS+=	-fomit-frame-pointer
 .endif
 .endif
 
+LDADD=		$(LDLIBS)
 
 # 若有定義 NO_FORK, 則在 CFLAGS內定義 NO_FORK
 .if defined(NO_FORK)
@@ -83,6 +84,14 @@ CXXFLAGS+=	-DNO_FORK
 ######################################
 # Settings for common libraries
 
+#libevent
+LIBEVENT_CFLAGS!=	pkg-config --cflags libevent
+LIBEVENT_LIBS_L!=	pkg-config --libs-only-L libevent
+LIBEVENT_LIBS_l!=	pkg-config --libs-only-l libevent
+
+# pmake common
+CLEANFILES+=	*~
+
 # NetBSD pmake
 MKLINT:=no
 MKPROFILE:=no
-- 
cgit v1.2.3