diff options
author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2012-04-02 21:14:31 +0800 |
---|---|---|
committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2012-04-02 21:14:31 +0800 |
commit | c97a7fda34d1c9b66a826139e88430ed7303a0d9 (patch) | |
tree | 82ee13cf159196e92f04f60cf7fe52a85e2b92a0 | |
parent | ca7f2e2c27286745ed3cb7db765a55f99479c264 (diff) | |
download | pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar.gz pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar.bz2 pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar.lz pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar.xz pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.tar.zst pttbbs-c97a7fda34d1c9b66a826139e88430ed7303a0d9.zip |
Fix libiconv link failure (thanks to x4base@PttCurrent)
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5592 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r-- | pttbbs/innbbsd/Makefile | 5 | ||||
-rw-r--r-- | pttbbs/util/Makefile | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pttbbs/innbbsd/Makefile b/pttbbs/innbbsd/Makefile index 7b368c99..427f5eff 100644 --- a/pttbbs/innbbsd/Makefile +++ b/pttbbs/innbbsd/Makefile @@ -38,9 +38,10 @@ ${UTIL_DIR}/${fn}: # FIXME: dependency cd ${UTIL_DIR}; make ${fn} .endfor -LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ +LDLIBS:=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/osdep/libosdep.a + $(SRCROOT)/common/osdep/libosdep.a \ + $(LDLIBS) echobbslib.o: echobbslib.c ${CC} ${CFLAGS} -DWITH_ECHOMAIL -c echobbslib.c diff --git a/pttbbs/util/Makefile b/pttbbs/util/Makefile index 7cbd2353..58edfa4b 100644 --- a/pttbbs/util/Makefile +++ b/pttbbs/util/Makefile @@ -42,12 +42,13 @@ PROGS= ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL}\ dailybackup.pl tarqueue.pl waterball.pl filtermail.pl \ getbackup.pl rebuildaloha.pl timecap_expire.sh -LDLIBS+=$(SRCROOT)/common/bbs/libcmbbs.a \ +LDLIBS:=$(SRCROOT)/common/bbs/libcmbbs.a \ $(SRCROOT)/common/sys/libcmsys.a \ - $(SRCROOT)/common/osdep/libosdep.a + $(SRCROOT)/common/osdep/libosdep.a \ + $(LDLIBS) - -all: ${SRCROOT}/include/var.h ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL} ${PROGS} +all: ${SRCROOT}/include/var.h \ + ${CPROG_WITH_UTIL} ${CPROG_WITHOUT_UTIL} ${CPP_WITH_UTIL} ${PROGS} .for fn in ${CPROG_WITH_UTIL} ${fn}: ${BBSBASE} ${fn}.c ${UTIL_OBJS} |