merge back from fav4 braches

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

1 files changed, 6 insertions, 7 deletions

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index b1bb69d6..911c3273 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -8,13 +8,12 @@ LDFLAGS+= -L/usr/local/lib/mysql -lmysqlclient
 .endif
 
 PROG=	mbbsd
-OBJS=	admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o\
-	card.o chat.o chc.o chicken.o dark.o\
-	edit.o friend.o gamble.o gomo.o guess.o indict.o io.o\
-	kaede.o lovepaper.o mail.o mbbsd.o menu.o more.o name.o osdep.o\
-	othello.o page.o read.o record.o register.o screen.o stuff.o\
-	talk.o term.o topsong.o user.o vice.o vote.o xyz.o\
-	voteboard.o syspost.o var.o passwd.o calendar.o
+OBJS=	admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\
+	chat.o chc.o chicken.o dark.o edit.o fav.o friend.o gamble.o gomo.o\
+	guess.o indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
+	more.o name.o osdep.o othello.o page.o read.o record.o\
+	register.o screen.o stuff.o talk.o term.o topsong.o user.o\
+	vice.o vote.o xyz.o voteboard.o syspost.o var.o passwd.o calendar.o
 
 .SUFFIXES: .c .o
 .c.o:	../include/var.h