storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* [w3m-dev 03038] LDFLAGS

Browse Source 
* XMakefile: refer to LDFLAGS when linking
* configure: add -ldflags=*
From: Katsumi Yamaoka  <yamaoka@jpl.org>
This commit is contained in:
Fumitoshi UKAI
2002-02-12 08:52:57 +00:00
parent 06c76fad55
commit 63edcab415
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -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> 2002-02-12 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
* [w3m-dev 03036] * [w3m-dev 03036]
@@ -2915,4 +2921,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-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 $

16
XMakefile
View File

@@ -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 \ 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\ form.c map.c frame.c rc.c menu.c mailcap.c image.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC) func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -42,7 +42,7 @@ AR=ar
all: $(TARGETS) all-scripts all: $(TARGETS) all-scripts
$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET) $(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
$(ALIB): $(ALIBOBJS) $(ALIB): $(ALIBOBJS)
$(AR) rv $(ALIB) $(ALIBOBJS) $(AR) rv $(ALIB) $(ALIBOBJS)
@@ -76,26 +76,26 @@ functable.c: funcname.tab mktable$(EXT)
-rm -f functable.tab -rm -f functable.tab
mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET) 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) $(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) $(HELPER): w3mhelperpanel.o $(ALIB) $(GCTARGET)
$(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS2) $(CC) $(CFLAGS) $(LDFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS2)
$(INFLATE): inflate.o $(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 inflate.o: inflate.c
$(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c $(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c
$(IMGDISPLAY): w3mimgdisplay.o $(IMGDISPLAY): w3mimgdisplay.o
$(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGDISPLAY) \ $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGDISPLAY) \
w3mimgdisplay.o `imlib-config --libs` w3mimgdisplay.o `imlib-config --libs`
$(IMGSIZE): w3mimgsize.o $(IMGSIZE): w3mimgsize.o
$(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGSIZE) \ $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGSIZE) \
w3mimgsize.o `imlib-config --libs` w3mimgsize.o `imlib-config --libs`
w3mimgdisplay.o: w3mimgdisplay.c w3mimgdisplay.o: w3mimgdisplay.c

7
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/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. # Configuration.
# #
@@ -97,6 +97,9 @@ do
-cflags=*|--cflags=*) -cflags=*|--cflags=*)
dcflags=`echo $1 | sed -e 's/-*cflags=//'` dcflags=`echo $1 | sed -e 's/-*cflags=//'`
;; ;;
-ldflags=*|--ldflags=*)
dldflags=`echo $1 | sed -e 's/-*ldflags=//'`
;;
--ssl-includedir=*) --ssl-includedir=*)
ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"` ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"`
;; ;;
@@ -126,6 +129,7 @@ do
echo "-code=(S|E|j|N|n|m)" echo "-code=(S|E|j|N|n|m)"
echo " Specify default kanji code" echo " Specify default kanji code"
echo "-cflags=FLAGS Specify C flags" echo "-cflags=FLAGS Specify C flags"
echo "-ldflags=FLAGS Specify LD flags"
echo "--ssl-includedir=DIR specify OpenSSL include dir" echo "--ssl-includedir=DIR specify OpenSSL include dir"
echo "--ssl-libdir=DIR specify OpenSSL lib dir" echo "--ssl-libdir=DIR specify OpenSSL lib dir"
echo "--gc-includedir=DIR specify Boehm-GC include dir" echo "--gc-includedir=DIR specify Boehm-GC include dir"
@@ -2071,6 +2075,7 @@ SYS_LIBRARIES = $gpmlib $termlib $ssllib $v6lib
LOCAL_LIBRARIES = $extlib LOCAL_LIBRARIES = $extlib
CC = $cc CC = $cc
MYCFLAGS = $cflags $bsdinclude $sslinclude MYCFLAGS = $cflags $bsdinclude $sslinclude
LDFLAGS = $ldflags
GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
KEYBIND_SRC = $keymap_file.c KEYBIND_SRC = $keymap_file.c
KEYBIND_OBJ = $keymap_file.o KEYBIND_OBJ = $keymap_file.o