summaryrefslogtreecommitdiffstats
path: root/mbbsd/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'mbbsd/Makefile')
-rw-r--r--mbbsd/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index af0a28d6..439a55bb 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -83,10 +83,11 @@ DIETCC= diet -Os
LDFLAGS+=-Wl,--sort-common
.endif
-.if defined(MERGEBBS)
-CFLAGS+= -DMERGEBBS
-OBJS+= merge.o
-.endif
+#.if defined(MERGEBBS)
+#CFLAGS+= -DMERGEBBS
+#OBJS+= ../upgrade/merge_sob.o
+#.endif
+
LIBS+= $(SRCROOT)/common/bbs/libcmbbs.a \
$(SRCROOT)/common/sys/libcmsys.a