From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 19 May 2005 23:08:46 +0000 (+0000)
Subject: Convert ttcp to new packaging style, add PKG_VERSION, use TARGET_CFLAGS
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/79f46a7d9c31a6fa429777bc6ca7f23fa1111a88?ds=inline

Convert ttcp to new packaging style, add PKG_VERSION, use TARGET_CFLAGS


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@982 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/ttcp/Makefile b/openwrt/package/ttcp/Makefile
index ec91ef735..080aa86f0 100644
--- a/openwrt/package/ttcp/Makefile
+++ b/openwrt/package/ttcp/Makefile
@@ -3,29 +3,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ttcp
+PKG_VERSION:=3.8
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ttcp
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
 
-$(PKG_BUILD_DIR)/usr/bin/ttcp:
-	mkdir -p $(PKG_BUILD_DIR)/usr/bin
-	$(TARGET_CC) -o $@ ttcp.c
-	$(STRIP) $@
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/usr/bin/ttcp
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(eval $(call PKG_template,TTCP,ttcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list:
-	$(IPKG) install $(PKG_IPK)
+$(PKG_BUILD_DIR)/.prepared:
+	mkdir -p $@
+	touch $@
 
-source:
-prepare:
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(PKG_BUILD_DIR)/.built:
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/ttcp ttcp.c
+	touch $@
+
+$(IPKG_TTCP):
+	install -d -m0755 $(IDIR_TTCP)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ttcp $(IDIR_TTCP)/usr/bin/
+	$(RSTRIP) $(IDIR_TTCP)
+	$(IPKG_BUILD) $(IDIR_TTCP) $(PACKAGE_DIR)
diff --git a/openwrt/package/ttcp/ipkg/ttcp.control b/openwrt/package/ttcp/ipkg/ttcp.control
new file mode 100644
index 000000000..3633ef1df
--- /dev/null
+++ b/openwrt/package/ttcp/ipkg/ttcp.control
@@ -0,0 +1,6 @@
+Package: ttcp
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: A small utility to test TCP connection performance
diff --git a/openwrt/package/ttcp/ttcp.control b/openwrt/package/ttcp/ttcp.control
deleted file mode 100644
index 3633ef1df..000000000
--- a/openwrt/package/ttcp/ttcp.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: ttcp
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: A small utility to test TCP connection performance