Skip to content

C
core
Kaydet (Commit) 1c70dc6f authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

openssl, libxmlsec: use gb_ExternalPackage_add_libraries_for_install 

Change-Id: I980307749c5fb6f3682374e091bbcb91cdebd5fa
üst 6d5c47ae
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
libxmlsec/ExternalPackage_xmlsec.mk
Dosyayı görüntüle @ 1c70dc6f
...@@ -14,14 +14,14 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec)) ...@@ -14,14 +14,14 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
ifeq ($(COM),GCC) ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
else else
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
endif endif
else ifeq ($(OS),ANDROID) else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
......
openssl/ExternalPackage_openssl.mk
Dosyayı görüntüle @ 1c70dc6f
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_files,openssl,lib,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_files,openssl,lib,\
out32dll/ssleay32.lib \ out32dll/ssleay32.lib \
out32dll/libeay32.lib \ out32dll/libeay32.lib \
)) ))
$(eval $(call gb_ExternalPackage_add_files,openssl,bin,\ $(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\
out32dll/ssleay32.dll \ out32dll/ssleay32.dll \
out32dll/libeay32.dll \ out32dll/libeay32.dll \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment