Mercurial > mxe-octave

diff src/zlib.mk @ 2855:47558e958113
Allow static/shared libraries to be configured in top-level Makefile.
author: John W. Eaton <jwe@octave.org>
date: Thu, 15 Nov 2012 16:11:45 -0500
parents: 5879c1871a03
children: 5ebec6b3a79c
--- a/src/zlib.mk	Wed Nov 14 10:53:53 2012 +0100
+++ b/src/zlib.mk	Thu Nov 15 16:11:45 2012 -0500
@@ -9,6 +9,9 @@
 $(PKG)_URL      := http://zlib.net/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
+ifneq ($(BUILD_SHARED),yes)
+$(PKG)_STATIC_FLAG := -static
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://zlib.net/' | \
@@ -19,6 +22,6 @@
 define $(PKG)_BUILD
     cd '$(1)' && CHOST='$(TARGET)' ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --static
+        $($(PKG)_STATIC_FLAG)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef