Clean up makefiles

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

1 files changed, 17 insertions, 32 deletions

diff --git a/pttbbs.mk b/pttbbs.mk
index b5a5d73c..bf536cfe 100644
--- a/pttbbs.mk
+++ b/pttbbs.mk
@@ -5,35 +5,24 @@ BBSHOME?=	/home/bbs
 
 SRCROOT?=	.
 
-OS!=		uname
-OS_MAJOR_VER!=	uname -r|cut -d . -f 1
-OS_MINOR_VER!=	uname -r|cut -d . -f 2
-OSTYPE?=	$(OS)
+OSTYPE!=	uname
 
 CC=		gcc
 CCACHE!=	which ccache|sed -e 's/^.*\///'
-PTT_CFLAGS=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
-PTT_LDFLAGS=	-L/usr/local/lib
-PTT_LIBS=	-lhz
+
+PTT_CFLAGS:=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
+PTT_LDFLAGS=
+PTT_LDLIBS=	-lhz
 
 # enable assert()
 #PTT_CFLAGS+=	-DNDEBUG 
 
+.if "$(OS)" == "FreeBSD"
 # FreeBSD特有的環境
-CFLAGS_FreeBSD=	-I/usr/local/include
-LDFLAGS_FreeBSD=
-LIBS_FreeBSD=	-lkvm -liconv
-
-# Linux特有的環境
-CFLAGS_Linux=	
-LDFLAGS_Linux=	
-LIBS_Linux=	
-
-# CFLAGS, LDFLAGS, LIBS 加入 OS 相關參數
-PTT_CFLAGS+=	$(CFLAGS_$(OSTYPE))
-PTT_LDFLAGS+=	$(LDFLAGS_$(OSTYPE))
-PTT_LIBS+=	$(LIBS_$(OSTYPE))
-
+PTT_CFLAGS+=  -I/usr/local/include
+PTT_LDFLAGS+= -L/usr/local/lib
+PTT_LDLIBS+=   -lkvm -liconv
+.endif
 
 # 若有定義 PROFILING
 .if defined(PROFILING)
@@ -50,18 +39,14 @@ GDB=		1
 PTT_CFLAGS+=	-DDEBUG 
 .endif
 
-.if defined(USE_ICC)
-CC=		icc
-CFLAGS=		$(PTT_CFLAGS) -O1 -tpp6 -mcpu=pentiumpro -march=pentiumiii \
-		-ip -ipo
-LDFLAGS+=	-O1 -tpp6 -mcpu=pentiumpro -march=pentiumiii -ip -ipo \
-		$(PTT_LDFLAGS) $(PTT_LIBS)
-.elif defined(GDB)
-CFLAGS=		-g -O0 $(PTT_CFLAGS)
-LDFLAGS=	-O0 $(PTT_LDFLAGS) $(PTT_LIBS)
+.if defined(GDB)
+CFLAGS:=	-g -O0 $(PTT_CFLAGS)
+LDFLAGS:=	-O0 $(PTT_LDFLAGS)
+LDLIBS:=	$(PTT_LDLIBS)
 .else
-CFLAGS+=	-g -Os $(PTT_CFLAGS) $(EXT_CFLAGS)
-LDFLAGS+=	-Os $(PTT_LDFLAGS) $(PTT_LIBS)
+CFLAGS:=	-g -Os $(PTT_CFLAGS) $(EXT_CFLAGS)
+LDFLAGS:=	-Os $(PTT_LDFLAGS)
+LDLIBS:=	$(PTT_LDLIBS)
 
 .if defined(OMITFP)
 CFLAGS+=	-fomit-frame-pointer