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

fdo#70393: move libcmis to a subdir of external

Browse source 
Change-Id: I602ae9b173e42d668cd9383fa0d2517576db12bf
Reviewed-on: https://gerrit.libreoffice.org/6326
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny 2013-10-18 18:55:45 +02:00 committed by David Tardon
parent a4964c6011
commit a522158332
10 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RepositoryModule_host.mk
View file

@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,CDR,libcdr) \
$(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,MSPUB,libmspub) \

1
external/Module_external.mk vendored
View file

@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,CAIRO,cairo) \
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,CT2N,ct2n) \
$(call gb_Helper_optional,CURL,curl) \

2
libcmis/Makefile → external/libcmis/Makefile vendored
View file

@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:

4
libcmis/Module_libcmis.mk → external/libcmis/Module_libcmis.mk vendored
View file

@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libcmis))
ifeq ($(SYSTEM_CMIS),NO)
$(eval $(call gb_Module_add_targets,libcmis,\
StaticLibrary_cmis \
UnpackedTarball_cmis \
))
endif
# vim: set noet sw=4 ts=4:

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

0
libcmis/StaticLibrary_cmis.mk → external/libcmis/StaticLibrary_cmis.mk vendored
View file

6
libcmis/UnpackedTarball_cmis.mk → external/libcmis/UnpackedTarball_cmis.mk vendored
View file

@ -14,11 +14,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
$(eval $(call gb_UnpackedTarball_add_patches,cmis, \
libcmis/libcmis-0.4.1.patch \
libcmis/libcmis-0.4.1-empty-path.patch))
external/libcmis/libcmis-0.4.1.patch \
external/libcmis/libcmis-0.4.1-empty-path.patch))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
$(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
endif
# vim: set noet sw=4 ts=4:

0
libcmis/boost-win.patch → external/libcmis/boost-win.patch vendored
View file

0
libcmis/libcmis-0.4.1-empty-path.patch → external/libcmis/libcmis-0.4.1-empty-path.patch vendored
View file

0
libcmis/libcmis-0.4.1.patch → external/libcmis/libcmis-0.4.1.patch vendored
View file