Clean up ccache.

Add CXXFLAGS


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

5 files changed, 23 insertions, 15 deletions

diff --git a/daemon/fromd/Makefile b/daemon/fromd/Makefile
index 054f9224..88530f60 100644
--- a/daemon/fromd/Makefile
+++ b/daemon/fromd/Makefile
@@ -11,9 +11,9 @@ all:	${PROGRAMS}
 
 .SUFFIXES: .c .cpp .o
 .c.o:
-	$(CCACHE) $(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 .cpp.o:
-	$(CCACHE) $(CXX) $(CFLAGS) -c $*.cpp
+	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 fromd: fromd.o ip_desc_db.o
 	${CC} ${CFLAGS} ${LDFLAGS} -levent -o $@ $> $(LDLIBS)
diff --git a/daemon/utmpd/Makefile b/daemon/utmpd/Makefile
index a6f99333..76075961 100644
--- a/daemon/utmpd/Makefile
+++ b/daemon/utmpd/Makefile
@@ -14,16 +14,16 @@ all:	${PROGRAMS}
 
 .SUFFIXES: .c .cpp .o
 .c.o:
-	$(CCACHE) $(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 .cpp.o:
-	$(CCACHE) $(CXX) $(CFLAGS) -c $*.cpp
+	$(CXX) $(CXXFLAGS) -c $*.cpp
 
 utmpserver: utmpserver.o $(UTILOBJ)
 	${CC} ${CFLAGS} ${LDFLAGS} -o $* $*.o $(UTILOBJ) $(LDLIBS)
 utmpserver2: utmpserver2.o friend.o $(UTILOBJ)
 	${CXX} ${CFLAGS} ${LDFLAGS} -o $* $*.o $(UTILOBJ) friend.o $(LDLIBS)
 utmpserver3: utmpserver3.o friend.o $(UTILOBJ)
-	${CXX} ${CFLAGS} ${LDFLAGS} -levent -o $* $*.o $(UTILOBJ) friend.o $(LDLIBS)
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -levent -o $* $*.o $(UTILOBJ) friend.o $(LDLIBS)
 utmpsync: utmpsync.o $(UTILOBJ)
 	${CC} ${CFLAGS} ${LDFLAGS} -o $* $*.o $(UTILOBJ) $(LDLIBS)
 
diff --git a/pttbbs.mk b/pttbbs.mk
index 8f72d59a..a8c188c9 100644
--- a/pttbbs.mk
+++ b/pttbbs.mk
@@ -16,22 +16,25 @@ CXX:=		ccache $(CXX)
 .endif
 
 PTT_CFLAGS:=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
-PTT_LDFLAGS=
-PTT_LDLIBS=	-lhz
+PTT_CXXFLAGS:=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
+PTT_LDFLAGS:=
+PTT_LDLIBS:=	-lhz
 
 # enable assert()
 #PTT_CFLAGS+=	-DNDEBUG 
 
 .if ${OSTYPE} == "FreeBSD"
 # FreeBSD特有的環境
-PTT_CFLAGS+=  -I/usr/local/include
-PTT_LDFLAGS+= -L/usr/local/lib
-PTT_LDLIBS+=   -lkvm -liconv
+PTT_CFLAGS+=	-I/usr/local/include
+PTT_CXXFLAGS+=	-I/usr/local/include
+PTT_LDFLAGS+=	-L/usr/local/lib
+PTT_LDLIBS+=	-lkvm -liconv
 .endif
 
 # 若有定義 PROFILING
 .if defined(PROFILING)
 PTT_CFLAGS+=	-pg
+PTT_CXXFLAGS+=	-pg
 PTT_LDFLAGS+=	-pg
 NO_OMITFP=	yes
 NO_FORK=	yes
@@ -42,19 +45,23 @@ NO_FORK=	yes
 GDB=		1
 #CFLAGS+=	-DDEBUG
 PTT_CFLAGS+=	-DDEBUG 
+PTT_CXXFLAGS+=	-DDEBUG 
 .endif
 
 .if defined(GDB)
 CFLAGS:=	-g -O0 $(PTT_CFLAGS)
+CXXFLAGS:=	-g -O0 $(PTT_CXXFLAGS)
 LDFLAGS:=	-O0 $(PTT_LDFLAGS)
 LDLIBS:=	$(PTT_LDLIBS)
 .else
 CFLAGS:=	-g -Os $(PTT_CFLAGS) $(EXT_CFLAGS)
+CXXFLAGS:=	-g -Os $(PTT_CXXFLAGS) $(EXT_CXXFLAGS)
 LDFLAGS:=	-Os $(PTT_LDFLAGS)
 LDLIBS:=	$(PTT_LDLIBS)
 
 .if defined(OMITFP)
 CFLAGS+=	-fomit-frame-pointer
+CXXFLAGS+=	-fomit-frame-pointer
 .endif
 .endif
 
@@ -62,6 +69,7 @@ CFLAGS+=	-fomit-frame-pointer
 # 若有定義 NO_FORK, 則在 CFLAGS內定義 NO_FORK
 .if defined(NO_FORK)
 CFLAGS+=	-DNO_FORK
+CXXFLAGS+=	-DNO_FORK
 .endif
 
 .MAIN: all
diff --git a/trans/Makefile b/trans/Makefile
index 6a72338c..e4f2c7eb 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -40,17 +40,17 @@ $(SRCROOT)/include/var.h: $(SRCROOT)/mbbsd/var.c
 
 .for fn in ${CPROG_WITH_UTIL}
 ${fn}: ${BBSBASE} ${fn}.c ${UTIL_OBJS}
-	$(CCACHE) ${CC} ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.c $(LIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.c $(LIBS)
 .endfor
 
 .for fn in ${CPP_WITH_UTIL}
 ${fn}: ${BBSBASE} ${fn}.cc ${UTIL_OBJS}
-	$(CCACHE) ${CXX} ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LIBS)
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LIBS)
 .endfor
 
 .for fn in ${MBBSD_OBJS}
 util_${fn}.o: ${BBSBASE} $(SRCROOT)/mbbsd/${fn}.c
-	$(CCACHE) ${CC} ${CFLAGS} -D_BBS_UTIL_C_ -c -o $@ $(SRCROOT)/mbbsd/${fn}.c
+	${CC} ${CFLAGS} -D_BBS_UTIL_C_ -c -o $@ $(SRCROOT)/mbbsd/${fn}.c
 .endfor
 
 install: $(PROGS)
diff --git a/util/Makefile b/util/Makefile
index 0ac65178..0ac9516f 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -57,7 +57,7 @@ ${fn}: ${BBSBASE} ${fn}.c ${UTIL_OBJS}
 
 .for fn in ${CPP_WITH_UTIL}
 ${fn}: ${BBSBASE} ${fn}.cc ${UTIL_OBJS}
-	$(CXX) ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LDLIBS)
+	$(CXX) ${CXXFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LDLIBS)
 .endfor
 
 .for fn in ${MBBSD_OBJS}
@@ -66,7 +66,7 @@ util_${fn}.o: ${BBSBASE} $(SRCROOT)/mbbsd/${fn}.c
 .endfor
 
 shmctl: ${BBSBASE} shmctl.c ${UTIL_OBJS}
-	${CXX} ${CFLAGS} ${LDFLAGS} -o shmctl ${UTIL_OBJS} shmctl.c $(LDLIBS)
+	${CC} ${CFLAGS} ${LDFLAGS} -o shmctl ${UTIL_OBJS} shmctl.c $(LDLIBS)
 
 bbsmail: ${BBSBASE} bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o bbsmail -DUSE_ICONV \