summaryrefslogtreecommitdiffstats
path: root/mbbsd/Makefile
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-24 00:51:24 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-24 00:51:24 +0800
commitd7dd7919a06864cffb048458575a46e49ac79424 (patch)
tree51468ac1f340368dab32324c9cb8a19f31cbec26 /mbbsd/Makefile
parent3c361a74447958d08c8b1151e9957336eb40b494 (diff)
downloadpttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar.gz
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar.bz2
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar.lz
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar.xz
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.tar.zst
pttbbs-d7dd7919a06864cffb048458575a46e49ac79424.zip
merge tools for fpg
git-svn-id: http://opensvn.csie.org/pttbbs/branches/Ptt.merge@2077 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/Makefile')
-rw-r--r--mbbsd/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 1a078380..c60550f3 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -7,6 +7,7 @@ CFLAGS+= -DBLOG
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 convert.o dark.o edit.o fav.o friend.o gamble.o\
@@ -15,6 +16,11 @@ OBJS= admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\
register.o screen.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
+.if defined(MERGEBBS)
+CFLAGS+= -DMERGEBBS
+OBJS+= merge.o
+.endif
+
.SUFFIXES: .c .o
.c.o: ../include/var.h
$(CCACHE) $(CC) $(CFLAGS) -c $*.c