summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Müllenhaupt <mm+git@netlair.de>2016-10-28 06:18:21 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2016-10-31 20:52:31 (GMT)
commit28905fe12a0b2ecc99598676bfde6970073f0cbd (patch)
treee9a94d937100b9b38f76147275ffbc69d63e2dbd /src
parentf78fa903af223f1534ea37041dccf7990816e787 (diff)
downloadmxe-28905fe12a0b2ecc99598676bfde6970073f0cbd.zip
mxe-28905fe12a0b2ecc99598676bfde6970073f0cbd.tar.gz
mxe-28905fe12a0b2ecc99598676bfde6970073f0cbd.tar.bz2
libnice: cleanup makefile
Diffstat (limited to 'src')
-rw-r--r--src/libnice.mk19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/libnice.mk b/src/libnice.mk
index fa0ca67..5ae354d 100644
--- a/src/libnice.mk
+++ b/src/libnice.mk
@@ -1,5 +1,4 @@
-# This file is part of MXE.
-# See index.html for further information.
+# This file is part of MXE. See LICENSE.md for licensing information.
PKG := libnice
$(PKG)_IGNORE :=
@@ -11,16 +10,22 @@ $(PKG)_URL := https://nice.freedesktop.org/releases/$($(PKG)_FILE)
$(PKG)_DEPS := gcc glib
define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://cgit.freedesktop.org/libnice/libnice/refs/tags' | \
+ grep '<a href=' | \
+ $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*\.[^<]*\)<.*,\1,p' | \
+ $(SORT) -Vr | \
+ head -1
endef
define $(PKG)_BUILD
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
- PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+ PKG_CONFIG='$(TARGET)-pkg-config' \
GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas' \
MAKE=$(MAKE)
- $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
- $(TARGET)-gcc \
- '$(1)/examples/simple-example.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)
+ $(TARGET)-gcc \
+ '$(SOURCE_DIR)/examples/simple-example.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
`$(TARGET)-pkg-config nice --cflags --libs`
endef