for porting to linux

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

2 files changed, 12 insertions, 9 deletions

diff --git a/pttbbs.mk b/pttbbs.mk
index 6822c537..3d138fe5 100644
--- a/pttbbs.mk
+++ b/pttbbs.mk
@@ -1,8 +1,8 @@
-# $Id: pttbbs.mk,v 1.5 2003/06/28 08:55:40 kcwu Exp $
+# $Id: pttbbs.mk,v 1.6 2003/07/14 07:22:09 victor Exp $
 # 定義基本初值
 BBSHOME?=	$(HOME)
 BBSHOME?=	/home/bbs
-OSTYPE?=	FreeBSD
+OSTYPE?=	Linux
 CC?=		gcc
 CCACHE!=	which ccache|sed -e 's/^.*\///'
 PTT_CFLAGS=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I../include
@@ -18,7 +18,8 @@ LDFLAGS_FreeBSD=
 LIBS_FreeBSD=	-lkvm
 
 # Linux特有的環境
-CFLAGS_linux=	-DHAVE_DES_CRYPT -DLinux
+# CFLAGS_linux=   -DHAVE_DES_CRYPT -DLinux
+CFLAGS_linux=	-DLinux
 LDFLAGS_linux=	-pipe -Wall 
 LIBS_linux=	
 
diff --git a/util/Makefile b/util/Makefile
index baf0bf6a..5bd45409 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,19 +1,18 @@
-# $Id: Makefile,v 1.32 2003/07/11 09:03:21 in2 Exp $
+# $Id: Makefile,v 1.33 2003/07/14 07:22:10 victor Exp $
 
 .include "../pttbbs.mk"
 
 UTIL_OBJS=	\
-	util_cache.o util_record.o util_passwd.o 
+	util_cache.o util_record.o util_passwd.o
 
 # 下面這些程式, 會被 compile 並且和 $(UTIL_OBJS) 聯結
 CPROG_WITH_UTIL= \
-	bbsmail		BM_money	post		poststat	\
+	boardlist	BM_money	post		poststat	\
 	jungo		account		birth		deluserfile	\
 	expire		mandex		rmuid		horoscope	\
 	openvice	parse_news	openticket	topusr		\
 	indexuser	yearsold	toplazyBM	toplazyBBM	\
-	reaper		buildAnnounce	inndBM		shmctl		\
-	boardlist
+	reaper		buildAnnounce	inndBM		shmctl
 
 # 下面這些程式, 會直接被 compile
 CPROG_WITHOUT_UTIL= \
@@ -30,13 +29,16 @@ PROGS=	${UTIL_OBJS}	${CPROG_WITH_UTIL}	${CPROG_WITHOUT_UTIL}	\
 	dailybackup.pl	tarqueue.pl	waterball.pl	filtermail.pl	\
 	getbackup.pl	udnnews.pl	rebuildaloha.pl	railway_wrapper.pl
 
-all: ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${PROGS}
+all: ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${PROGS} bbsmail
 
 .for fn in ${CPROG_WITH_UTIL}
 ${fn}:	${fn}.c ${UTIL_OBJS}
 	${CC} ${CFLAGS} -o ${fn} ${fn}.c ${UTIL_OBJS}
 .endfor
 
+bbsmail: bbsmail.c ${CPROG_WITH_UTIL} ../mbbsd/osdep.o
+	${CC} ${CFLAGS} -o bbsmail bbsmail.c ${UTIL_OBJS} ../mbbsd/osdep.o
+
 xchatd: xchatd.c  $(UTIL_OBJS) descrypt.c
 	$(CC) $(CFLAGS) -o $@ $@.c  $(UTIL_OBJS) descrypt.c $(LIBCHAT)