]> xenbits.xensource.com Git - xenclient/build.git/commitdiff
Moved curl makefile to be consistent with package name and allow patching.
authorJean-Sebastien Legare <jean-sebastien.legare@citrix.com>
Mon, 26 Oct 2009 16:56:44 +0000 (09:56 -0700)
committerJean-Sebastien Legare <jean-sebastien.legare@citrix.com>
Tue, 27 Oct 2009 16:17:32 +0000 (09:17 -0700)
package/curl/Config.in [deleted file]
package/curl/curl.mk [deleted file]
package/libcurl/Config.in [new file with mode: 0644]
package/libcurl/curl.mk [new file with mode: 0644]

diff --git a/package/curl/Config.in b/package/curl/Config.in
deleted file mode 100644 (file)
index 1d6d08e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_LIBCURL
-       bool "libcurl"
-       help
-         cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
-         and Dict servers, using any of the supported protocols.
-
-         http://curl.haxx.nu/
-
-config BR2_PACKAGE_CURL
-       bool "curl binary"
-       depends on BR2_PACKAGE_LIBCURL
-       help
-         Install curl binary as well
diff --git a/package/curl/curl.mk b/package/curl/curl.mk
deleted file mode 100644 (file)
index 4e92eca..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#############################################################
-#
-# curl
-#
-#############################################################
-LIBCURL_VERSION = 7.19.6
-LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
-LIBCURL_SITE = http://curl.haxx.se/download/
-LIBCURL_INSTALL_STAGING = YES
-LIBCURL_LIBTOOL_PATCH = NO
-LIBCURL_DEPENDENCIES = openssl
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
-                  --with-random=/dev/urandom --with-ssl \
-                  $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
-
-$(eval $(call AUTOTARGETS,package,libcurl))
-
-$(LIBCURL_HOOK_POST_INSTALL):
-       rm -rf $(TARGET_DIR)/usr/bin/curl-config \
-              $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
new file mode 100644 (file)
index 0000000..1d6d08e
--- /dev/null
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBCURL
+       bool "libcurl"
+       help
+         cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
+         and Dict servers, using any of the supported protocols.
+
+         http://curl.haxx.nu/
+
+config BR2_PACKAGE_CURL
+       bool "curl binary"
+       depends on BR2_PACKAGE_LIBCURL
+       help
+         Install curl binary as well
diff --git a/package/libcurl/curl.mk b/package/libcurl/curl.mk
new file mode 100644 (file)
index 0000000..4e92eca
--- /dev/null
@@ -0,0 +1,20 @@
+#############################################################
+#
+# curl
+#
+#############################################################
+LIBCURL_VERSION = 7.19.6
+LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
+LIBCURL_SITE = http://curl.haxx.se/download/
+LIBCURL_INSTALL_STAGING = YES
+LIBCURL_LIBTOOL_PATCH = NO
+LIBCURL_DEPENDENCIES = openssl
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
+                  --with-random=/dev/urandom --with-ssl \
+                  $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
+
+$(eval $(call AUTOTARGETS,package,libcurl))
+
+$(LIBCURL_HOOK_POST_INSTALL):
+       rm -rf $(TARGET_DIR)/usr/bin/curl-config \
+              $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)