diff options
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/lpsolve/ExternalPackage_lpsolve.mk (renamed from lpsolve/ExternalPackage_lpsolve.mk) | 0 | ||||
-rw-r--r-- | external/lpsolve/ExternalProject_lpsolve.mk (renamed from lpsolve/ExternalProject_lpsolve.mk) | 0 | ||||
-rw-r--r-- | external/lpsolve/Makefile (renamed from lpsolve/Makefile) | 2 | ||||
-rw-r--r-- | external/lpsolve/Module_lpsolve.mk (renamed from lpsolve/Module_lpsolve.mk) | 4 | ||||
-rw-r--r-- | external/lpsolve/README (renamed from lpsolve/README) | 0 | ||||
-rw-r--r-- | external/lpsolve/UnpackedTarball_lpsolve.mk (renamed from lpsolve/UnpackedTarball_lpsolve.mk) | 10 | ||||
-rw-r--r-- | external/lpsolve/ccc.static (renamed from lpsolve/ccc.static) | 0 | ||||
-rw-r--r-- | external/lpsolve/lp_solve-aix.patch (renamed from lpsolve/lp_solve-aix.patch) | 0 | ||||
-rw-r--r-- | external/lpsolve/lp_solve-fixed-warn.patch (renamed from lpsolve/lp_solve-fixed-warn.patch) | 0 | ||||
-rw-r--r-- | external/lpsolve/lp_solve_5.5-windows.patch (renamed from lpsolve/lp_solve_5.5-windows.patch) | 0 | ||||
-rw-r--r-- | external/lpsolve/lp_solve_5.5.patch (renamed from lpsolve/lp_solve_5.5.patch) | 0 |
13 files changed, 7 insertions, 11 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 2d3be85e1c1f..bf900b1e62a5 100644 --- a/RepositoryModule_host.mk +++ b/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) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index ec88b2d84e36..9d24b23b51b9 100644 --- a/external/Module_external.mk +++ b/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) \ diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk index 70bfa67ed5eb..70bfa67ed5eb 100644 --- a/lpsolve/ExternalPackage_lpsolve.mk +++ b/external/lpsolve/ExternalPackage_lpsolve.mk diff --git a/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk index 55da70457538..55da70457538 100644 --- a/lpsolve/ExternalProject_lpsolve.mk +++ b/external/lpsolve/ExternalProject_lpsolve.mk diff --git a/lpsolve/Makefile b/external/lpsolve/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/lpsolve/Makefile +++ b/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: diff --git a/lpsolve/Module_lpsolve.mk b/external/lpsolve/Module_lpsolve.mk index 10d0bbad2d30..e0094f609c7d 100644 --- a/lpsolve/Module_lpsolve.mk +++ b/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: diff --git a/lpsolve/README b/external/lpsolve/README index 3ef9db3e1cdd..3ef9db3e1cdd 100644 --- a/lpsolve/README +++ b/external/lpsolve/README diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/external/lpsolve/UnpackedTarball_lpsolve.mk index f9074a2cd218..464fcab8a1ef 100644 --- a/lpsolve/UnpackedTarball_lpsolve.mk +++ b/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: diff --git a/lpsolve/ccc.static b/external/lpsolve/ccc.static index 6911c4b2c892..6911c4b2c892 100644 --- a/lpsolve/ccc.static +++ b/external/lpsolve/ccc.static diff --git a/lpsolve/lp_solve-aix.patch b/external/lpsolve/lp_solve-aix.patch index 6ad5877ca499..6ad5877ca499 100644 --- a/lpsolve/lp_solve-aix.patch +++ b/external/lpsolve/lp_solve-aix.patch diff --git a/lpsolve/lp_solve-fixed-warn.patch b/external/lpsolve/lp_solve-fixed-warn.patch index 46742887a85f..46742887a85f 100644 --- a/lpsolve/lp_solve-fixed-warn.patch +++ b/external/lpsolve/lp_solve-fixed-warn.patch diff --git a/lpsolve/lp_solve_5.5-windows.patch b/external/lpsolve/lp_solve_5.5-windows.patch index 70fb553fcdc9..70fb553fcdc9 100644 --- a/lpsolve/lp_solve_5.5-windows.patch +++ b/external/lpsolve/lp_solve_5.5-windows.patch diff --git a/lpsolve/lp_solve_5.5.patch b/external/lpsolve/lp_solve_5.5.patch index 124fed82343a..124fed82343a 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/external/lpsolve/lp_solve_5.5.patch |