summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorwens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-06-13 16:05:51 +0800
committerwens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-06-13 16:05:51 +0800
commitf076301f829cd83641259802d5bb9ef04f527946 (patch)
tree43c2c96c5a8237cdc358bb830d08f6b57b2689c8 /util
parent05edd556caefcf9b30686d4d3d8c0f1d57153d36 (diff)
downloadpttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar.gz
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar.bz2
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar.lz
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar.xz
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.tar.zst
pttbbs-f076301f829cd83641259802d5bb9ef04f527946.zip
Makefile cleanup
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4349 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'util')
-rw-r--r--util/Makefile19
1 files changed, 8 insertions, 11 deletions
diff --git a/util/Makefile b/util/Makefile
index 06bcbf73..0ac65178 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -50,29 +50,26 @@ LDLIBS+= $(SRCROOT)/common/sys/libcmsys.a \
all: ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL} ${PROGS}
-$(SRCROOT)/include/var.h: $(SRCROOT)/mbbsd/var.c
- cd $(SRCROOT)/mbbsd; $(MAKE) $(SRCROOT)/include/var.h
-
.for fn in ${CPROG_WITH_UTIL}
${fn}: ${BBSBASE} ${fn}.c ${UTIL_OBJS}
- $(CCACHE) ${CC} ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.c $(LDLIBS)
+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.c $(LDLIBS)
.endfor
.for fn in ${CPP_WITH_UTIL}
${fn}: ${BBSBASE} ${fn}.cc ${UTIL_OBJS}
- $(CCACHE) g++ ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LDLIBS)
+ $(CXX) ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LDLIBS)
.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
shmctl: ${BBSBASE} shmctl.c ${UTIL_OBJS}
- $(CCACHE) ${CXX} ${CFLAGS} ${LDFLAGS} -o shmctl ${UTIL_OBJS} shmctl.c $(LDLIBS)
+ ${CXX} ${CFLAGS} ${LDFLAGS} -o shmctl ${UTIL_OBJS} shmctl.c $(LDLIBS)
bbsmail: ${BBSBASE} bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS)
- $(CCACHE) $(CC) $(CFLAGS) $(LDFLAGS) -o bbsmail -DUSE_ICONV \
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bbsmail -DUSE_ICONV \
bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS) $(LDLIBS)
install: $(PROGS)
@@ -94,7 +91,7 @@ installfiltermail:
# for diskstat(FreeBSD 4.x only) .
# diskstat should be compiled with bbs and installed with root
diskstat: diskstat.c
- $(CCACHE) $(CC) $(CFLAGS) -o diskstat diskstat.c -ldevstat -lkvm
+ $(CC) $(CFLAGS) -o diskstat diskstat.c -ldevstat -lkvm
installdiskstat: diskstat
cp -f diskstat /usr/local/bin/
@@ -103,7 +100,7 @@ installdiskstat: diskstat
# for bbsctl. bbsctl should be compiled with bbs and installed with root
bbsctl: bbsctl.c
- $(CCACHE) $(CC) $(CFLAGS) ${LDFLAGS} -o $@ $@.c $(LDLIBS)
+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ $@.c $(LDLIBS)
installbbsctl: bbsctl
rm -f /home/bbs/bin/bbsctl
@@ -112,4 +109,4 @@ installbbsctl: bbsctl
chmod 4755 /home/bbs/bin/bbsctl
cleanpasswd: cleanpasswd.c ${UTIL_OBJS}
- $(CCACHE) ${CC} ${CFLAGS} ${LDFLAGS} -o cleanpasswd ${UTIL_OBJS} cleanpasswd.c
+ ${CC} ${CFLAGS} ${LDFLAGS} -o cleanpasswd ${UTIL_OBJS} cleanpasswd.c