diff options
| -rw-r--r-- | common/bbs/Makefile | 2 | ||||
| -rw-r--r-- | common/sys/Makefile | 2 | ||||
| -rw-r--r-- | innbbsd/Makefile | 20 | ||||
| -rw-r--r-- | mbbsd/Makefile | 27 | ||||
| -rw-r--r-- | pttbbs.mk | 49 | ||||
| -rw-r--r-- | util/Makefile | 16 |
6 files changed, 45 insertions, 71 deletions
diff --git a/common/bbs/Makefile b/common/bbs/Makefile index 94a9eade..99086258 100644 --- a/common/bbs/Makefile +++ b/common/bbs/Makefile @@ -2,8 +2,6 @@ SRCROOT= ../.. .include "$(SRCROOT)/pttbbs.mk" -CFLAGS+= -I$(SRCROOT)/include - OBJS= log.o file.o money.o names.o path.o time.o string.o # record.o TARGET= libcmbbs.a diff --git a/common/sys/Makefile b/common/sys/Makefile index 4c696ea8..9c7bb257 100644 --- a/common/sys/Makefile +++ b/common/sys/Makefile @@ -2,8 +2,6 @@ SRCROOT= ../.. .include "$(SRCROOT)/pttbbs.mk" -CFLAGS+= -I$(SRCROOT)/include - OBJS= file.o lock.o log.o net.o sort.o string.o time.o crypt.o osdep.o TARGET= libcmsys.a diff --git a/innbbsd/Makefile b/innbbsd/Makefile index 66d0741e..3dcb2175 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -5,22 +5,20 @@ SRCROOT= .. VERSION= 0.50-pttpatch ADMINUSER?= root@your.domain.name +.if "$(OS)" == "FreeBSD" # FreeBSD innbbsd肂惠把计 -inn_CFLAGS_FreeBSD= -DBSD44 -DMMAP -DGETRUSAGE -inn_LDFLAGS_FreeBSD= -L/usr/local/lib -liconv - +inn_CFLAGS= -DBSD44 -DMMAP -DGETRUSAGE +inn_LDFLAGS= -L/usr/local/lib -liconv +.else # Linux innbbsd肂惠把计 -inn_CFLAGS_Linux= -DLINUX -DGETRUSAGE -inn_LDFLAGS_Linux= - -# Solarisinnbbsd肂惠把计 -inn_CFLAGS_Solaris= -DMMAP -DSolaris -DSYSV -I/usr/local/include/ -inn_LDFLAGS_Solaris= -L/usr/local/lib -liconv -lsocket -lnsl -lkstat +inn_CFLAGS= -DLINUX -DGETRUSAGE +inn_LDFLAGS= +.endif CFLAGS+= -DVERSION=\"${VERSION}\" \ -DADMINUSER=\"${ADMINUSER}\" \ -DMapleBBS -DDBZDEBUG -I. \ - ${inn_CFLAGS_${OSTYPE}} -DHMM_USE_ANTI_SPAM + ${inn_CFLAGS} -DHMM_USE_ANTI_SPAM LDFLAGS+= ${inn_LDFLAGS_${OSTYPE}} @@ -73,7 +71,7 @@ clean: rm -f *.o ${PROGS} core *.core reset: - cd ../util/; ${MAKE} clean shmctl + cd $(SRCROOT)/util/; ${MAKE} clean shmctl ${MAKE} clean ; ${MAKE} ; ${MAKE} install killall innbbsd cd ~; nohup innd/innbbsd 7777 & diff --git a/mbbsd/Makefile b/mbbsd/Makefile index df76bdaa..e5cb2a9d 100644 --- a/mbbsd/Makefile +++ b/mbbsd/Makefile @@ -29,8 +29,7 @@ OBJS= admin.o assess.o edit.o menu.o xyz.o var.o visio.o \ .if !defined(WITHOUT_BLOG) && defined(WITH_BLOG) CFLAGS+= -DBLOG -LDFLAGS+= -L/usr/local/lib/mysql -LIBS+= -lmysqlclient +LDLIBS+= `mysql_config --libs` .endif .if !defined(WITHOUT_LOG_CRAWLER) && defined(WITH_LOG_CRAWLER) @@ -40,7 +39,7 @@ CFLAGS+= -DLOG_CRAWLER .if !defined(WITHOUT_EMAILDB) && defined(WITH_EMAILDB) OBJS+= emaildb.o CFLAGS+= -DUSE_EMAILDB -LIBS+= -lsqlite3 +LDLIBS+= -lsqlite3 .endif .if !defined(WITHOUT_BBSLUA_USAGE) && defined(WITH_BBSLUA_USAGE) @@ -51,13 +50,13 @@ CFLAGS+= -DBBSLUA_USAGE OBJS+= bbslua.o bbsluaext.o CFLAGS+= -DUSE_BBSLUA # MODIFY THESE ENVIRONMENT SETTINGS TO FIT YOUR CONFIGURATION -CFLAGS+= -I/usr/include/lua5.1 -CFLAGS_FreeBSD += -I/usr/local/include/lua51 -LDFLAGS_FreeBSD+= -L/usr/local/lib/lua51 -# modify the lib name below to fit your configuration -# usually you'd try "-llua" instead of "-llua5.1". -LIBS+= -llua5.1 -lm -#LIBS+= -llua -lm +.if $(OS)=="FreeBSD" +CFLAGS+= `pkg-config --cflags lua-5.1` +LDLIBS+= `pkg-config --libs lua-5.1` +.else +CFLAGS+= `pkg-config --cflags lua5.1` +LDLIBS+= `pkg-config --libs lua5.1` +.endif .endif .if !defined(WITHOUT_PFTERM) && defined(WITH_PFTERM) @@ -89,7 +88,7 @@ LDFLAGS+=-Wl,--sort-common #OBJS+= ../upgrade/merge_sob.o #.endif -LIBS+= $(SRCROOT)/common/bbs/libcmbbs.a \ +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a ####################################################################### @@ -104,7 +103,7 @@ all: $(PROG) $(PROG): $(OBJS) sh $(SRCROOT)/util/newvers.sh - $(DIETCC) $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS) $(EXT_LIBS) vers.c + $(DIETCC) $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDLIBS) vers.c $(SRCROOT)/include/var.h: var.c perl $(SRCROOT)/util/parsevar.pl < var.c > $(SRCROOT)/include/var.h @@ -116,10 +115,10 @@ mbbsd.o: mbbsd.c $(SRCROOT)/include/var.h $(SRCROOT)/include/banip.h $(CCACHE) $(DIETCC) $(CC) $(CFLAGS) -c $< initemaildb: emaildb.c - $(CC) -DINIT_MAIN $(CFLAGS) $(LDFLAGS) -o initemaildb emaildb.c $(LIBS) + $(CC) -DINIT_MAIN $(CFLAGS) $(LDFLAGS) -o initemaildb emaildb.c $(LDLIBS) ctags: - ctags *.c ../include/*.h ../common/sys/*.c ../common/bbs/*.c + ctags *.c $(SRCROOT)/include/*.h $(SRCROOT)/common/sys/*.c $(SRCROOT)/common/bbs/*.c test: $(PROG) killall -TERM testmbbsd || true @@ -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 diff --git a/util/Makefile b/util/Makefile index 58c7bde8..06bcbf73 100644 --- a/util/Makefile +++ b/util/Makefile @@ -44,7 +44,7 @@ PROGS= ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL}\ dailybackup.pl tarqueue.pl waterball.pl filtermail.pl \ getbackup.pl udnnews.pl rebuildaloha.pl -LIBS+= $(SRCROOT)/common/sys/libcmsys.a \ +LDLIBS+= $(SRCROOT)/common/sys/libcmsys.a \ $(SRCROOT)/common/bbs/libcmbbs.a @@ -55,12 +55,12 @@ $(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) + $(CCACHE) ${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 $(LIBS) + $(CCACHE) g++ ${CFLAGS} ${LDFLAGS} -o ${fn} ${UTIL_OBJS} ${fn}.cc $(LDLIBS) .endfor .for fn in ${MBBSD_OBJS} @@ -69,15 +69,11 @@ util_${fn}.o: ${BBSBASE} $(SRCROOT)/mbbsd/${fn}.c .endfor shmctl: ${BBSBASE} shmctl.c ${UTIL_OBJS} - $(CCACHE) ${CXX} ${CFLAGS} ${LDFLAGS} -o shmctl ${UTIL_OBJS} shmctl.c $(LIBS) -#shmctl: ${BBSBASE} shmctl.c ${UTIL_OBJS} -# $(CCACHE) gcc -g -DBBSHOME='"/home/bbs"' -I$(SRCROOT)/include -D__OS_MAJOR_VERSION__="2" -D__OS_MINOR_VERSION__="6" -DPTTBBS_UTIL -O1 -o shmctl ${UTIL_OBJS} shmctl.c -#shmctl: ${BBSBASE} shmctl.cc ${UTIL_OBJS} -# $(CCACHE) g++ -g -DBBSHOME='"/home/bbs"' -I$(SRCROOT)/include -D__OS_MAJOR_VERSION__="2" -D__OS_MINOR_VERSION__="6" -DPTTBBS_UTIL -O1 -o shmctl ${UTIL_OBJS} shmctl.cc + $(CCACHE) ${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 \ - bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS) $(LIBS) + bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS) $(LDLIBS) install: $(PROGS) install -d $(BBSHOME)/bin/ @@ -107,7 +103,7 @@ installdiskstat: diskstat # for bbsctl. bbsctl should be compiled with bbs and installed with root bbsctl: bbsctl.c - $(CCACHE) $(CC) $(CFLAGS) ${LDFLAGS} -o $@ $@.c $(LIBS) + $(CCACHE) $(CC) $(CFLAGS) ${LDFLAGS} -o $@ $@.c $(LDLIBS) installbbsctl: bbsctl rm -f /home/bbs/bin/bbsctl |