diff options
author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-08-01 01:36:16 +0000 |
---|---|---|
committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-08-01 01:36:16 +0000 |
commit | 81ed13cf894dfe1ed66fd5940c0be512586f6e15 (patch) | |
tree | 859cc276f2742e269263759f8c5436268d39b9ca /obsolete-buildroot/make/openssl.mk | |
parent | 2106b3258b7ca028dce432da0673a8a6607b9f03 (diff) |
clean up yesterday's reorganization
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'obsolete-buildroot/make/openssl.mk')
-rw-r--r-- | obsolete-buildroot/make/openssl.mk | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/obsolete-buildroot/make/openssl.mk b/obsolete-buildroot/make/openssl.mk index 3fa273f5b..8366e8cf2 100644 --- a/obsolete-buildroot/make/openssl.mk +++ b/obsolete-buildroot/make/openssl.mk @@ -8,9 +8,10 @@ OPENSSL_SITE:=http://www.openssl.org/source OPENSSL_SOURCE:=openssl-0.9.7d.tar.gz OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.7d -OPENSSL_PATCH=$(SOURCE_DIR)/openssl.patch +OPENSSL_IPK_DIR=$(OPENWRT_IPK_DIR)/openssl +OPENSSL_PATCH=$(OPENSSL_IPK_DIR)/openssl.patch -OPENSSL_IPK_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk +OPENSSL_IPK_BUILD_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk LIBSSL_IPK=$(BUILD_DIR)/libssl_0.9.7d_mipsel.ipk $(DL_DIR)/$(OPENSSL_SOURCE): @@ -68,15 +69,15 @@ openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 -$(LIBSSL_IPK): uclibc $(STAGING_DIR)/usr/lib/libcrypto.a - mkdir -p $(OPENSSL_IPK_DIR)/CONTROL - cp $(SOURCE_DIR)/openwrt/openssl/control $(OPENSSL_IPK_DIR)/CONTROL/control - mkdir -p $(OPENSSL_IPK_DIR)/usr/lib - cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_DIR)/usr/lib/ - cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_DIR)/usr/lib/ - -$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libssl.so.0.9.7 - -$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libcrypto.so.0.9.7 - cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_DIR) +$(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a + mkdir -p $(OPENSSL_IPK_BUILD_DIR)/CONTROL + cp $(OPENSSL_IPK_DIR)/control $(OPENSSL_IPK_BUILD_DIR)/CONTROL/control + mkdir -p $(OPENSSL_IPK_BUILD_DIR)/usr/lib + cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/ + cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/ + -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7 + -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7 + cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_BUILD_DIR) openssl-ipk: $(LIBSSL_IPK) @@ -86,6 +87,7 @@ openssl-clean: rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so* rm -f $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/libssl.so* + rm -rf $(OPENSSL_IPK_BUILD_DIR) $(MAKE) -C $(OPENSSL_DIR) clean openssl-dirclean: |