fdo#70393: move libcdr to a subdir of external

Change-Id: If862bdfc338daa60a104e9b28924343363bb2fab
Reviewed-on: https://gerrit.libreoffice.org/6328
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,CDR,libcdr) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \

external/Module_external.mk

@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,BOOST,boost) \
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,CAIRO,cairo) \
+	$(call gb_Helper_optional,CDR,libcdr) \
 	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \

external/libcdr/Makefile

@@ -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:

external/libcdr/Module_libcdr.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libcdr))
 
-ifeq ($(SYSTEM_CDR),NO)
-
 $(eval $(call gb_Module_add_targets,libcdr,\
 	ExternalProject_libcdr \
 	UnpackedTarball_libcdr \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

external/libcdr/UnpackedTarball_libcdr.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
-	libcdr/libcdr-wpx_seek_end.patch.1 \
+	external/libcdr/libcdr-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: