summaryrefslogtreecommitdiffstats
path: root/mbbsd/Makefile
diff options
context:
space:
mode:
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