[Buildroot] [PATCH 1/4] Convert tinyhttpd to gentargets
Maxime Ripard
maxime.ripard at free-electrons.com
Tue Apr 3 08:55:29 UTC 2012
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
---
package/tinyhttpd/tinyhttpd.mk | 58 +++++++++-------------------------------
1 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 0f95d06..95b624e 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -3,54 +3,22 @@
# tinyhttpd
#
#############################################################
-TINYHTTPD_VER:=0.1.0
-TINYHTTPD_SOURCE:=tinyhttpd-$(TINYHTTPD_VER).tar.gz
-TINYHTTPD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/$(TINYHTTPD_SOURCE)
-TINYHTTPD_DIR:=$(BUILD_DIR)/tinyhttpd-$(TINYHTTPD_VER)
-TINYHTTPD_CAT:=$(ZCAT)
-TINYHTTPD_BINARY:=httpd
-TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd
+TINYHTTPD_VERSION := 0.1.0
+TINYHTTPD_SITE := http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/
-$(DL_DIR)/$(TINYHTTPD_SOURCE):
- $(call DOWNLOAD,$(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE))
+define TINYHTTPD_BUILD_CMDS
+ $(MAKE1) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" httpd
+endef
-tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
-
-#############################################################
-#
-# build tinyhttpd for use on the target system
-#
-#############################################################
-$(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
- $(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
- touch $(TINYHTTPD_DIR)/.unpacked
-
-$(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked
- $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) -C $(TINYHTTPD_DIR)
-
-$(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY)
- $(INSTALL) -m 0755 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
+define TINYHTTPD_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(@D)/httpd $(TARGET_DIR)/usr/sbin/
$(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d
mkdir -p $(TARGET_DIR)/var/www
+endef
-tinyhttpd: $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
+define TINYHTTPD_CLEAN_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/httpd
+ rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
+endef
-tinyhttpd-clean:
- -$(MAKE) -C $(TINYHTTPD_DIR) clean
- @rm -f $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
- @rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
- @rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/var/www
-
-tinyhttpd-dirclean:
- rm -rf $(TINYHTTPD_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_TINYHTTPD),y)
-TARGETS+=tinyhttpd
-endif
+$(eval $(call GENTARGETS))
--
1.7.5.4
More information about the buildroot
mailing list