merge from my branch

  merge chc_*.c to chc.c
  merge gomo1.c into gomo.c
  add new feature to chc


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

1 files changed, 3 insertions, 3 deletions

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 5762a2d7..e6a9adbd 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.29 2003/07/20 00:55:34 in2 Exp $
+# $Id$
 
 .include "../pttbbs.mk"
 
@@ -9,8 +9,8 @@ LDFLAGS+= -L/usr/local/lib/mysql -lmysqlclient
 
 PROG=	mbbsd
 OBJS=	admin.o announce.o args.o bbs.o board.o cache.o cal.o card.o\
-	chat.o chc_draw.o chc_net.o chc_play.o chc_rule.o chicken.o dark.o\
-	edit.o friend.o gamble.o gomo.o gomo1.o guess.o indict.o io.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\