strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#70393: move curl to a subdir of external

Browse source 
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d
Reviewed-on: https://gerrit.libreoffice.org/6298
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny 2013-10-17 19:28:04 +02:00 committed by David Tardon
parent 39f73d9387
commit a777285f9b
16 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RepositoryModule_host.mk
View file

@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
cui \
$(call gb_Helper_optional,CURL,curl) \
dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \

1
external/Module_external.mk vendored
View file

@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,CT2N,ct2n) \
$(call gb_Helper_optional,CURL,curl) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))

0
curl/ExternalPackage_curl.mk → external/curl/ExternalPackage_curl.mk vendored
View file

0
curl/ExternalProject_curl.mk → external/curl/ExternalProject_curl.mk vendored
View file

0
curl/Makefile → external/curl/Makefile vendored
View file

2
curl/Module_curl.mk → external/curl/Module_curl.mk vendored
View file

@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,curl))
ifeq ($(SYSTEM_CURL),NO)
$(eval $(call gb_Module_add_targets,curl,\
UnpackedTarball_curl \
ExternalPackage_curl \
ExternalProject_curl \
))
endif
# vim: set noet sw=4 ts=4:

0
curl/README → external/curl/README vendored
View file

16
curl/UnpackedTarball_curl.mk → external/curl/UnpackedTarball_curl.mk vendored
View file

@ -18,17 +18,17 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
lib/Makefile.vc9 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
curl/curl-7.26.0.patch \
curl/curl-7.26.0_nspr.patch \
curl/curl-aix.patch \
curl/curl-7.26.0_win.patch \
curl/curl-7.26.0_mingw.patch \
curl/curl-7.26.0_win-proxy.patch \
curl/curl-7.26.0_strlcat.patch \
external/curl/curl-7.26.0.patch \
external/curl/curl-7.26.0_nspr.patch \
external/curl/curl-aix.patch \
external/curl/curl-7.26.0_win.patch \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/curl-7.26.0_strlcat.patch \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
curl/curl-android.patch \
external/curl/curl-android.patch \
))
endif
# vim: set noet sw=4 ts=4:

0
curl/curl-7.26.0.patch → external/curl/curl-7.26.0.patch vendored
View file

0
curl/curl-7.26.0_mingw.patch → external/curl/curl-7.26.0_mingw.patch vendored
View file

0
curl/curl-7.26.0_nspr.patch → external/curl/curl-7.26.0_nspr.patch vendored
View file

0
curl/curl-7.26.0_strlcat.patch → external/curl/curl-7.26.0_strlcat.patch vendored
View file

0
curl/curl-7.26.0_win-proxy.patch → external/curl/curl-7.26.0_win-proxy.patch vendored
View file

0
curl/curl-7.26.0_win.patch → external/curl/curl-7.26.0_win.patch vendored
View file

0
curl/curl-aix.patch → external/curl/curl-aix.patch vendored
View file

0
curl/curl-android.patch → external/curl/curl-android.patch vendored
View file