fdo#70393: move lpsolve to a subdir of external

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

RepositoryModule_host.mk

@@ -75,7 +75,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
-	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \

external/Module_external.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	$(call gb_Helper_optional,LIBXSLT,libxslt) \
+	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \

external/lpsolve/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/lpsolve/Module_lpsolve.mk

@@ -9,14 +9,10 @@
 
 $(eval $(call gb_Module_Module,lpsolve))
 
-ifeq ($(ENABLE_LPSOLVE),TRUE)
-ifeq ($(SYSTEM_LPSOLVE),NO)
 $(eval $(call gb_Module_add_targets,lpsolve,\
 	UnpackedTarball_lpsolve \
 	ExternalPackage_lpsolve \
 	ExternalProject_lpsolve \
 ))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:

external/lpsolve/UnpackedTarball_lpsolve.mk

@@ -17,18 +17,18 @@ ifeq ($(OS_FOR_BUILD),WNT)
 
 $(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve_5.5-windows.patch \
+	external/lpsolve/lp_solve_5.5-windows.patch \
 ))
 
 else
 
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve-aix.patch \
-	lpsolve/lp_solve-fixed-warn.patch \
-	lpsolve/lp_solve_5.5.patch \
+	external/lpsolve/lp_solve-aix.patch \
+	external/lpsolve/lp_solve-fixed-warn.patch \
+	external/lpsolve/lp_solve_5.5.patch \
 ))
 
-$(eval $(call gb_UnpackedTarball_add_file,lpsolve,lpsolve55/ccc.static,lpsolve/ccc.static))
+$(eval $(call gb_UnpackedTarball_add_file,lpsolve,lpsolve55/ccc.static,external/lpsolve/ccc.static))
 
 endif
 # vim: set noet sw=4 ts=4: