Uniformize package Makefile, move ipkg related files to ./ipkg

[openwrt.git] / package / haserl / Makefile

diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index b4be172..e361d45 100644 (file)
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -7,35 +7,70 @@ PKG_VERSION := 0.8.0
 PKG_RELEASE := 1
 PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea
 
 PKG_RELEASE := 1
 PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea
 

-PKG_SOURCE_SITE := @SF/haserl
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_SOURCE_URL := @SF/haserl
+PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT := zcat

 PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk

+PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

+$(DL_DIR)/$(PKG_SOURCE):
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)

 
 

-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $(PKG_BUILD_DIR)/.unpacked

 
 

-$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-#      $(PATCH) $(PKG_BUILD_DIR) ./patches
-       cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-       chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
+               ./configure \
+                 --target=$(GNU_TARGET_NAME) \
+                 --host=$(GNU_TARGET_NAME) \
+                 --build=$(GNU_HOST_NAME) \
+                 --program-prefix="" \
+                 --program-suffix="" \
+                 --prefix=/usr \
+                 --exec-prefix=/usr \
+                 --bindir=/usr/bin \
+                 --datadir=/usr/share \
+                 --includedir=/usr/include \
+                 --infodir=/usr/share/info \
+                 --libdir=/usr/lib \
+                 --libexecdir=/usr/lib \
+                 --localstatedir=/var \
+                 --mandir=/usr/share/man \
+                 --sbindir=/usr/sbin \
+                 --sysconfdir=/etc \
+                 $(DISABLE_LARGEFILE) \
+                 $(DISABLE_NLS) \
+       )
+       touch $(PKG_BUILD_DIR)/.configured

 
 

-$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
-       cd $(PKG_BUILD_DIR); \
-       TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-       ./ipkg/rules package
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+       $(MAKE) -C $(PKG_BUILD_DIR)
+       touch $(PKG_BUILD_DIR)/.built
+
+$(PKG_INSTALL_DIR)/usr/bin/haserl: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+         DESTDIR="$(PKG_INSTALL_DIR)" \
+        install
+       
+$(PKG_IPK): $(PKG_INSTALL_DIR)/usr/bin/haserl
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       mkdir -p $(PKG_IPK_DIR)/usr/bin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/
+       $(STRIP) $(PKG_IPK_DIR)/usr/bin/*
+       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)

 
 $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
        $(IPKG) install $(PKG_IPK)
 
 
 $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
        $(IPKG) install $(PKG_IPK)
 

-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked

 compile: $(PKG_IPK)
 install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
 compile: $(PKG_IPK)
 install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list