From e84d61124509ef31a56e20c2b8905c686ddd0961 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Wed, 2 Jan 2008 15:48:41 +0000
Subject: - general fix of some messages - improve Makefile more - prevent
 broken Welcome

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3776 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/Makefile | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'mbbsd/Makefile')

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 72da221a..c5c0959d 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -3,32 +3,39 @@
 SRCROOT=	..
 .include "$(SRCROOT)/pttbbs.mk"
 
+#######################################################################
 # common modules
+#######################################################################
 
 PROG=	mbbsd
-OBJS=	admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\
-	chat.o chicken.o convert.o crypt.o edit.o fav.o friend.o gamble.o\
-	guess.o indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
-	more.o name.o osdep.o read.o record.o register.o\
+CHESSOBJS= chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o othello.o
+GAMEOBJS = card.o guess.o chicken.o
+SYSOBJS  = args.o crypt.o osdep.o
+OBJS=	admin.o announce.o assess.o bbs.o board.o cache.o cal.o\
+	chat.o convert.o edit.o fav.o friend.o gamble.o\
+	indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
+	more.o name.o read.o record.o register.o\
 	stuff.o talk.o term.o topsong.o user.o brc.o vice.o vote.o\
 	xyz.o voteboard.o syspost.o var.o passwd.o calendar.o file.o \
 	pmore.o telnet.o \
-	chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o othello.o
+	$(SYSOBJS) $(CHESSOBJS) $(GAMEOBJS)
 
-# optional modules
+#######################################################################
+# conditional configurations and optional modules
+#######################################################################
 
 .if !defined(WITHOUT_BLOG) 	&& defined(WITH_BLOG)
 CFLAGS+=  -DBLOG
 LDFLAGS+= -L/usr/local/lib/mysql -lmysqlclient
 .endif
 
-.if !defined(WITHOUT_EMAILDB) && defined(WITH_EMAILDB)
+.if !defined(WITHOUT_EMAILDB)	&& defined(WITH_EMAILDB)
 OBJS+=   emaildb.o
 CFLAGS+= -DUSE_EMAILDB
 LDFLAGS+= -lsqlite3
 .endif
 
-.if !defined(WITHOUT_PFTERM) && defined(WITH_PFTERM)
+.if !defined(WITHOUT_PFTERM)	&& defined(WITH_PFTERM)
 OBJS+=	pfterm.o
 CFLAGS+=  -DUSE_PFTERM
 #CFLAGS+= -DDBG_OUTRPT
@@ -36,6 +43,10 @@ CFLAGS+=  -DUSE_PFTERM
 OBJS+=	screen.o
 .endif
 
+#######################################################################
+# special library (DIET) configuration
+#######################################################################
+
 .if defined(DIET)
 OBJS+=	random.o time.o alloc.o
 DIETCC=	diet -Os
@@ -55,6 +66,10 @@ OBJS+= merge.o
 LIBS+=	$(SRCROOT)/src/libbbsutil/libbbsutil.a \
 	$(SRCROOT)/src/libbbs/libbbs.a
 
+#######################################################################
+# Make Rules
+#######################################################################
+
 .SUFFIXES: .c .o
 .c.o:	$(SRCROOT)/include/var.h
 	$(CCACHE) $(DIETCC) $(CC) $(CFLAGS) -c $*.c
-- 
cgit v1.2.3