w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit 1d247942ba67a71c91b6e2d54630581922d51e62
parent ee3435356c06e8dd22e7e5b34cb4205dacbbb800
Author: ukai <ukai>
Date:   Tue, 12 Feb 2002 08:52:57 +0000

* [w3m-dev 03038] LDFLAGS
* XMakefile: refer to LDFLAGS when linking
* configure: add -ldflags=*
From: Katsumi Yamaoka  <yamaoka@jpl.org>

Diffstat:
MChangeLog | 6++++++
MXMakefile | 14+++++++-------
Mconfigure | 5+++++
3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -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] diff --git a/XMakefile b/XMakefile @@ -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 diff --git a/configure b/configure @@ -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