mman picomodel pire: use new-style options

3 files changed, 17 insertions, 33 deletions

diff --git a/src/mman-win32.mk b/src/mman-win32.mk
index 77cbddd..b89f50c 100644
--- a/src/mman-win32.mk
+++ b/src/mman-win32.mk
@@ -6,19 +6,15 @@ $(PKG)_DESCR    := MMA-Win32
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := b7ec370
 $(PKG)_CHECKSUM := 6f94db28ddf30711c7b227e97c5142f72f77aca2c5cc034a7d012db242cc2f7b
-$(PKG)_SUBDIR   := witwall-mman-win32-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/witwall/mman-win32/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_GH_CONF  := witwall/mman-win32/branches/master
 $(PKG)_DEPS     := cc
 
-$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) | $(SED) 's/^\(.......\).*/\1/;'
-
 define $(PKG)_BUILD
-    mkdir '$(1).build'
-    cd    '$(1).build' && '$(TARGET)-cmake' '$(1)'\
+    # build and install the library
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
         -DBUILD_TESTS=OFF
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     '$(TARGET)-gcc' -W -Wall \
         '$(1)/test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
diff --git a/src/picomodel.mk b/src/picomodel.mk
index ffb1e87..33817d1 100644
--- a/src/picomodel.mk
+++ b/src/picomodel.mk
@@ -5,19 +5,13 @@ $(PKG)_WEBSITE  := https://code.google.com/p/picomodel/
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1142ad8
 $(PKG)_CHECKSUM := e9dd8b78278a454602a81eb388603142a15f2124f549f478d4edc93149eb6dd0
-$(PKG)_SUBDIR   := ufoai-$(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/ufoai/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_GH_CONF  := ufoai/picomodel/branches/master
 $(PKG)_DEPS     := cc
 
-$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, ufoai/picomodel, master)
-
 define $(PKG)_BUILD
-    cd '$(1)' && ./autogen.sh && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    cd '$(SOURCE_DIR)' && ./autogen.sh
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
-
-$(PKG)_BUILD_SHARED =
diff --git a/src/pire.mk b/src/pire.mk
index 49e46ca..da59666 100644
--- a/src/pire.mk
+++ b/src/pire.mk
@@ -6,26 +6,20 @@ $(PKG)_DESCR    := PIRE
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.0.5
 $(PKG)_CHECKSUM := 85a9bd66fff568554826e4aff9b188ed6124e3ea0530cc561723b36aea2a58e3
-$(PKG)_SUBDIR   := pire-release-$($(PKG)_VERSION)
-$(PKG)_FILE     := pire-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/yandex/pire/archive/release-$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := yandex/pire/tags,release-
 $(PKG)_DEPS     := cc
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, yandex/pire, release-)
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && autoreconf -fi
-    cd '$(1)' && ./configure \
+    cd '$(SOURCE_DIR)' && autoreconf -fi
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --enable-extra \
         ac_cv_func_malloc_0_nonnull=yes
-    $(MAKE) -C '$(1)/pire' -j '$(JOBS)' bin_PROGRAMS= LDFLAGS='-no-undefined'
-    $(MAKE) -C '$(1)/pire' -j 1 install bin_PROGRAMS=
+    $(MAKE) -C '$(BUILD_DIR)/pire' -j '$(JOBS)' bin_PROGRAMS= LDFLAGS='-no-undefined'
+    $(MAKE) -C '$(BUILD_DIR)/pire' -j 1 install bin_PROGRAMS=
 
     '$(TARGET)-g++' \
         -W -Wall -Werror \
-        '$(1)/samples/pigrep/pigrep.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(SOURCE_DIR)/samples/pigrep/pigrep.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         -lpire
 endef