Add ext2 as a compiled in on x86-2.4 so it's available for initrd on netboot and...

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 1b7ead8..be5b4a6 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -20,13 +26,32 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libopenssl
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Open source SSL libraries
+DEPENDS:=+zlib
+DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
+URL:=http://www.openssl.org/
+endef
+
+define Package/openssl-util
+$(call Package/libopenssl)
+DEPENDS:=libopenssl
+TITLE:=OpenSSL command line utilities
+DESCRIPTION:=OpenSSL command line utilities
+endef
+
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef
 
 define Build/Configure
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
        $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
        (cd $(PKG_BUILD_DIR); \
-               PATH=$(TARGET_PATH) \
                ./Configure linux-openwrt \
                  --prefix=/usr \
                  --openssldir=/etc/ssl \
@@ -52,7 +77,7 @@ define Build/Compile
        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
-               CC=$(TARGET_CC) \
+               CC="$(TARGET_CC)" \
                CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \
                do_linux-shared
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
@@ -68,28 +93,10 @@ define Build/InstallDev
 endef
        
 define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/openssl \
+       rm -rf  $(STAGING_DIR)/usr/include/openssl \
                $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 
-
-define Package/libopenssl
- SECTION:=base
- CATEGORY:=Libraries
- TITLE:=Open source SSL libraries
- DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
- URL:=http://www.openssl.org/
-endef
-
-define Package/openssl-util
- $(call Package/libopenssl)
- DEPENDS:=libopenssl
- TITLE:=OpenSSL command line utilities
- DESCRIPTION:=OpenSSL command line utilities
-endef
-
-
 define Package/libopenssl/install
        install -d -m0755 $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
@@ -106,6 +113,5 @@ define Package/openssl-util/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
 endef
 
-
 $(eval $(call BuildPackage,libopenssl))
 $(eval $(call BuildPackage,openssl-util))