* revise Makefile

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

5 files changed, 30 insertions, 23 deletions

diff --git a/cacheserver/Makefile b/cacheserver/Makefile
index c923b1a3..bdff3f08 100644
--- a/cacheserver/Makefile
+++ b/cacheserver/Makefile
@@ -1,8 +1,10 @@
 # $Id$
-.include "../pttbbs.mk"
+SRCROOT=	..
+.include "$(SRCROOT)/pttbbs.mk"
 
 PROGRAMS=	utmpserver utmpsync utmpserver2 utmpserver3 authserver
-UTILOBJ=	../util/util_stuff.o ../util/util_var.o ../util/util_file.o ../util/util_cache.o ../util/util_passwd.o ../util/util_record.o ../util/util_osdep.o ../util/util_args.o
+UTILDIR=	$(SRCROOT)/util
+UTILOBJ=	$(UTILDIR)/util_stuff.o $(UTILDIR)/util_var.o $(UTILDIR)/util_file.o $(UTILDIR)/util_cache.o $(UTILDIR)/util_passwd.o $(UTILDIR)/util_record.o $(UTILDIR)/util_osdep.o $(UTILDIR)/util_args.o
 
 all:	${PROGRAMS}
 
diff --git a/innbbsd/Makefile b/innbbsd/Makefile
index 0e6c75cc..78d15673 100644
--- a/innbbsd/Makefile
+++ b/innbbsd/Makefile
@@ -1,5 +1,6 @@
 # $Id$
-.include "../pttbbs.mk"
+SRCROOT=	..
+.include "$(SRCROOT)/pttbbs.mk"
 
 VERSION=	0.50-pttpatch
 ADMINUSER?=	root@your.domain.name
@@ -29,7 +30,7 @@ PROGS=		bbslink		bbsnnrp		ctlinnbbsd	\
 all:	${PROGS}
 
 # bbs util
-UTIL_DIR=	../util
+UTIL_DIR=	$(SRCROOT)/util
 UTIL_OBJS=	\
 	util_cache.o	util_record.o	util_passwd.o	util_var.o	\
 	util_stuff.o	util_osdep.o	util_args.o	util_file.o
diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index eb26c91f..327749b3 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
-.include "../pttbbs.mk"
+SRCROOT=	..
+.include "$(SRCROOT)/pttbbs.mk"
 
 .if defined(WITH_BLOG)
 CFLAGS+=  -DBLOG
@@ -35,22 +36,22 @@ OBJS+= merge.o
 .endif
 
 .SUFFIXES: .c .o
-.c.o:	../include/var.h
+.c.o:	$(SRCROOT)/include/var.h
 	$(CCACHE) $(DIETCC) $(CC) $(CFLAGS) -c $*.c
 
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	sh ../util/newvers.sh
+	sh $(SRCROOT)/util/newvers.sh
 	$(DIETCC) $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS) $(EXT_LIBS) vers.c
 
-../include/var.h:	var.c
-	perl ../util/parsevar.pl < var.c > ../include/var.h
+$(SRCROOT)/include/var.h:	var.c
+	perl $(SRCROOT)/util/parsevar.pl < var.c > $(SRCROOT)/include/var.h
 
-../include/banip.h: ../util/banip.pl
-	perl ../util/banip.pl > $@
+$(SRCROOT)/include/banip.h: $(SRCROOT)/util/banip.pl
+	perl $(SRCROOT)/util/banip.pl > $@
 
-mbbsd.o: mbbsd.c ../include/var.h ../include/banip.h
+mbbsd.o: mbbsd.c $(SRCROOT)/include/var.h $(SRCROOT)/include/banip.h
 	$(CCACHE) $(DIETCC) $(CC) $(CFLAGS) -c $<
 
 test: $(PROG)
diff --git a/pttbbs.mk b/pttbbs.mk
index 7f88be49..79c21177 100644
--- a/pttbbs.mk
+++ b/pttbbs.mk
@@ -3,6 +3,8 @@
 BBSHOME?=	$(HOME)
 BBSHOME?=	/home/bbs
 
+SRCROOT?=	.
+
 OS!=		uname
 OS_MAJOR_VER!=	uname -r|cut -d . -f 1
 OS_MINOR_VER!=	uname -r|cut -d . -f 2
@@ -10,7 +12,7 @@ OSTYPE?=	$(OS)
 
 CC=		gcc
 CCACHE!=	which ccache|sed -e 's/^.*\///'
-PTT_CFLAGS=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I../include
+PTT_CFLAGS=	-Wall -pipe -DBBSHOME='"$(BBSHOME)"' -I$(SRCROOT)/include
 PTT_LDFLAGS=	-L/usr/local/lib
 PTT_LIBS=	-lhz
 
diff --git a/util/Makefile b/util/Makefile
index a12afc38..d7e06524 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,10 +1,11 @@
 # $Id$
 
-.include "../pttbbs.mk"
+SRCROOT=	..
+.include "$(SRCROOT)/pttbbs.mk"
 
 CFLAGS+= -DPTTBBS_UTIL
 
-BBSBASE=	../include/var.h
+BBSBASE=	$(SRCROOT)/include/var.h
 
 UTIL_OBJS=	\
 	util_cache.o	util_record.o	util_passwd.o	util_var.o	\
@@ -44,8 +45,8 @@ PROGS=	${CPROG_WITH_UTIL}		${CPROG_WITHOUT_UTIL}		\
 
 all: ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${PROGS}
 
-../include/var.h: ../mbbsd/var.c
-	cd ../mbbsd; $(MAKE) ../include/var.h
+$(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}
@@ -53,20 +54,20 @@ ${fn}: ${BBSBASE} ${fn}.c ${UTIL_OBJS}
 .endfor
 
 .for fn in ${MBBSD_OBJS}
-util_${fn}.o: ${BBSBASE} ../mbbsd/${fn}.c
-	$(CCACHE) ${CC} ${CFLAGS} -D_BBS_UTIL_C_ -c -o $@ ../mbbsd/${fn}.c
+util_${fn}.o: ${BBSBASE} $(SRCROOT)/mbbsd/${fn}.c
+	$(CCACHE) ${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
 #shmctl: ${BBSBASE} shmctl.c ${UTIL_OBJS}
-#	$(CCACHE) gcc -g -DBBSHOME='"/home/bbs"' -I../include  -D__OS_MAJOR_VERSION__="2"  -D__OS_MINOR_VERSION__="6" -DPTTBBS_UTIL  -O1  -o shmctl ${UTIL_OBJS} shmctl.c
+#	$(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../include  -D__OS_MAJOR_VERSION__="2"  -D__OS_MINOR_VERSION__="6" -DPTTBBS_UTIL  -O1 -o shmctl ${UTIL_OBJS} shmctl.cc
+#	$(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
 
-bbsmail: ${BBSBASE} bbsmail.c ../innbbsd/str_decode.c $(UTIL_OBJS)
+bbsmail: ${BBSBASE} bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS)
 	$(CCACHE) $(CC) $(CFLAGS) $(LDFLAGS) -o bbsmail -DUSE_ICONV \
-	bbsmail.c ../innbbsd/str_decode.c $(UTIL_OBJS)
+	bbsmail.c $(SRCROOT)/innbbsd/str_decode.c $(UTIL_OBJS)
 
 install: $(PROGS)
 	install -d $(BBSHOME)/bin/