diff options
| author | wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-06-28 23:50:14 +0800 |
|---|---|---|
| committer | wens <wens@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-06-28 23:50:14 +0800 |
| commit | 1347f95d83b908cd4e61904154feed6ae9ab7389 (patch) | |
| tree | f2a81144fa8c7fe8bf874e5e5c0561186e0d7660 | |
| parent | 4ba1777ffaa8cacae3651c0082f538c92b3a9bbb (diff) | |
| download | pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar.gz pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar.bz2 pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar.lz pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar.xz pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.tar.zst pttbbs-1347f95d83b908cd4e61904154feed6ae9ab7389.zip | |
Reorder libraries.
Use time() in fhdr_stamp.c
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4384 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | common/bbs/fhdr_stamp.c | 2 | ||||
| -rw-r--r-- | daemon/fromd/Makefile | 4 | ||||
| -rw-r--r-- | daemon/utmpd/Makefile | 5 | ||||
| -rw-r--r-- | innbbsd/Makefile | 4 | ||||
| -rw-r--r-- | mbbsd/Makefile | 6 | ||||
| -rw-r--r-- | trans/Makefile | 4 | ||||
| -rw-r--r-- | util/Makefile | 4 |
7 files changed, 15 insertions, 14 deletions
diff --git a/common/bbs/fhdr_stamp.c b/common/bbs/fhdr_stamp.c index 6b81f909..05c9bccf 100644 --- a/common/bbs/fhdr_stamp.c +++ b/common/bbs/fhdr_stamp.c @@ -31,7 +31,7 @@ static inline int fhdr_stamp(char *fpath, fileheader_t *fh, int type) { char *ip = fpath; - time4_t dtime = time4(0); + time4_t dtime = time(0); struct tm ptime; int res = 0; diff --git a/daemon/fromd/Makefile b/daemon/fromd/Makefile index 88530f60..6584d0ec 100644 --- a/daemon/fromd/Makefile +++ b/daemon/fromd/Makefile @@ -4,8 +4,8 @@ SRCROOT= ../.. PROGRAMS= fromd fromc -LDLIBS+= $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/bbs/libcmbbs.a +LDLIBS+=$(SRCROOT)/common/sys/libcmsys.a \ + $(SRCROOT)/common/osdep/libosdep.a all: ${PROGRAMS} diff --git a/daemon/utmpd/Makefile b/daemon/utmpd/Makefile index 76075961..6abe9c7c 100644 --- a/daemon/utmpd/Makefile +++ b/daemon/utmpd/Makefile @@ -7,8 +7,9 @@ PROGRAMS= utmpserver utmpsync utmpserver2 utmpserver3 authserver UTILDIR= $(SRCROOT)/util UTILOBJ= $(UTILDIR)/util_var.o $(UTILDIR)/util_cache.o $(UTILDIR)/util_passwd.o $(UTILDIR)/util_record.o -LDLIBS+= $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/bbs/libcmbbs.a +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ + $(SRCROOT)/common/sys/libcmsys.a \ + $(SRCROOT)/common/osdep/libosdep.a all: ${PROGRAMS} diff --git a/innbbsd/Makefile b/innbbsd/Makefile index 2f61729d..2f3caafa 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -39,9 +39,9 @@ ${UTIL_DIR}/${fn}: # FIXME: dependency cd ${UTIL_DIR}; make ${fn} .endfor -LDLIBS+=$(SRCROOT)/common/osdep/libosdep.a \ +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/bbs/libcmbbs.a + $(SRCROOT)/common/osdep/libosdep.a echobbslib.o: echobbslib.c ${CC} ${CFLAGS} -DWITH_ECHOMAIL -c echobbslib.c diff --git a/mbbsd/Makefile b/mbbsd/Makefile index 38586512..3b084122 100644 --- a/mbbsd/Makefile +++ b/mbbsd/Makefile @@ -86,9 +86,9 @@ LDFLAGS+=-Wl,--sort-common #OBJS+= ../upgrade/merge_sob.o #.endif -LDLIBS+=$(SRCROOT)/common/osdep/libosdep.a \ - $(SRCROOT)/common/bbs/libcmbbs.a \ - $(SRCROOT)/common/sys/libcmsys.a +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ + $(SRCROOT)/common/sys/libcmsys.a \ + $(SRCROOT)/common/osdep/libosdep.a ####################################################################### # Make Rules diff --git a/trans/Makefile b/trans/Makefile index 830c8bc2..17f90bcd 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -29,9 +29,9 @@ CPROG_WITHOUT_UTIL= \ # 下面這些程式會被 install PROGS= ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL}\ -LDLIBS+=$(SRCROOT)/common/osdep/libosdep.a \ +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/bbs/libcmbbs.a + $(SRCROOT)/common/osdep/libosdep.a all: $(SRCROOT)/include/var.h ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL} ${PROGS} diff --git a/util/Makefile b/util/Makefile index 3e9a45c5..b9bb8eb3 100644 --- a/util/Makefile +++ b/util/Makefile @@ -44,9 +44,9 @@ PROGS= ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL}\ dailybackup.pl tarqueue.pl waterball.pl filtermail.pl \ getbackup.pl udnnews.pl rebuildaloha.pl -LDLIBS+=$(SRCROOT)/common/osdep/libosdep.a \ +LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/bbs/libcmbbs.a + $(SRCROOT)/common/osdep/libosdep.a all: ${SRCROOT}/include/var.h ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL} ${PROGS} |