build: export filtered -lz flag in config.mak
authorMans Rullgard <mans@mansr.com>
Tue, 28 Aug 2012 15:24:09 +0000 (16:24 +0100)
committerMans Rullgard <mans@mansr.com>
Tue, 28 Aug 2012 22:40:30 +0000 (23:40 +0100)
This is needed to link tools/cws2fws using a linker with non-standard
command line syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Makefile
configure

index c49e381..b766e6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ all: $(PROGS)
 $(TOOLS): %$(EXESUF): %.o
        $(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS)
 
-tools/cws2fws$(EXESUF): ELIBS = -lz
+tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
 
 config.h: .config
 .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
index 06bcc1c..32118d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3561,6 +3561,7 @@ TARGET_EXEC=$target_exec
 TARGET_PATH=$target_path
 LIBS-avplay=$sdl_libs
 CFLAGS-avplay=$sdl_cflags
+ZLIB=$($ldflags_filter -lz)
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
 EXTRALIBS=$extralibs
 INSTALL=install