diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | XMakefile | 16 | ||||
| -rwxr-xr-x | configure | 7 |
3 files changed, 21 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2002-02-12 Katsumi Yamaoka <yamaoka@jpl.org> + + * [w3m-dev 03038] LDFLAGS + * XMakefile: refer to LDFLAGS when linking + * configure: add -ldflags=* + 2002-02-12 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp> * [w3m-dev 03036] @@ -2915,4 +2921,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.314 2002/02/12 08:43:45 ukai Exp $ +$Id: ChangeLog,v 1.315 2002/02/12 08:52:57 ukai Exp $ @@ -1,4 +1,4 @@ -# $Id: XMakefile,v 1.20 2002/01/31 17:54:48 ukai Exp $ +# $Id: XMakefile,v 1.21 2002/02/12 08:52:57 ukai Exp $ SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \ form.c map.c frame.c rc.c menu.c mailcap.c image.c\ func.c cookie.c history.c backend.c $(KEYBIND_SRC) @@ -42,7 +42,7 @@ AR=ar all: $(TARGETS) all-scripts $(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET) - $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) $(ALIB): $(ALIBOBJS) $(AR) rv $(ALIB) $(ALIBOBJS) @@ -76,26 +76,26 @@ functable.c: funcname.tab mktable$(EXT) -rm -f functable.tab mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET) - $(CC) $(CFLAGS) -o mktable$(EXT) mktable.o hash.o $(LIBS2) + $(CC) $(CFLAGS) $(LDFLAGS) -o mktable$(EXT) mktable.o hash.o $(LIBS2) $(BOOKMARKER): w3mbookmark.o $(ALIB) $(GCTARGET) - $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o $(LIBS2) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(BOOKMARKER) w3mbookmark.o $(LIBS2) $(HELPER): w3mhelperpanel.o $(ALIB) $(GCTARGET) - $(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS2) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS2) $(INFLATE): inflate.o - $(CC) $(CFLAGS) $(Z_CFLAGS) -o $(INFLATE) inflate.o $(ZLIB) + $(CC) $(CFLAGS) $(Z_CFLAGS) $(LDFLAGS) -o $(INFLATE) inflate.o $(ZLIB) inflate.o: inflate.c $(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c $(IMGDISPLAY): w3mimgdisplay.o - $(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGDISPLAY) \ + $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGDISPLAY) \ w3mimgdisplay.o `imlib-config --libs` $(IMGSIZE): w3mimgsize.o - $(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGSIZE) \ + $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGSIZE) \ w3mimgsize.o `imlib-config --libs` w3mimgdisplay.o: w3mimgdisplay.c @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.61 2002/02/04 15:18:41 ukai Exp $ +# $Id: configure,v 1.62 2002/02/12 08:52:58 ukai Exp $ # Configuration. # @@ -97,6 +97,9 @@ do -cflags=*|--cflags=*) dcflags=`echo $1 | sed -e 's/-*cflags=//'` ;; + -ldflags=*|--ldflags=*) + dldflags=`echo $1 | sed -e 's/-*ldflags=//'` + ;; --ssl-includedir=*) ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"` ;; @@ -126,6 +129,7 @@ do echo "-code=(S|E|j|N|n|m)" echo " Specify default kanji code" echo "-cflags=FLAGS Specify C flags" + echo "-ldflags=FLAGS Specify LD flags" echo "--ssl-includedir=DIR specify OpenSSL include dir" echo "--ssl-libdir=DIR specify OpenSSL lib dir" echo "--gc-includedir=DIR specify Boehm-GC include dir" @@ -2071,6 +2075,7 @@ SYS_LIBRARIES = $gpmlib $termlib $ssllib $v6lib LOCAL_LIBRARIES = $extlib CC = $cc MYCFLAGS = $cflags $bsdinclude $sslinclude +LDFLAGS = $ldflags GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS KEYBIND_SRC = $keymap_file.c KEYBIND_OBJ = $keymap_file.o |