From 79832d9259d609e8189ecfb48cd2856e83bb8d75 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 18 Oct 2013 22:30:25 +0200 Subject: [PATCH] fdo#70393: move lpsolve to a subdir of external Change-Id: I6c4a3bbd2cb514b979165bb041524706f3c28b0a Reviewed-on: https://gerrit.libreoffice.org/6341 Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + .../lpsolve}/ExternalPackage_lpsolve.mk | 0 .../lpsolve}/ExternalProject_lpsolve.mk | 0 {lpsolve => external/lpsolve}/Makefile | 2 +- {lpsolve => external/lpsolve}/Module_lpsolve.mk | 4 ---- {lpsolve => external/lpsolve}/README | 0 .../lpsolve}/UnpackedTarball_lpsolve.mk | 10 +++++----- {lpsolve => external/lpsolve}/ccc.static | 0 {lpsolve => external/lpsolve}/lp_solve-aix.patch | 0 .../lpsolve}/lp_solve-fixed-warn.patch | 0 .../lpsolve}/lp_solve_5.5-windows.patch | 0 {lpsolve => external/lpsolve}/lp_solve_5.5.patch | 0 13 files changed, 7 insertions(+), 11 deletions(-) rename {lpsolve => external/lpsolve}/ExternalPackage_lpsolve.mk (100%) rename {lpsolve => external/lpsolve}/ExternalProject_lpsolve.mk (100%) rename {lpsolve => external/lpsolve}/Makefile (71%) rename {lpsolve => external/lpsolve}/Module_lpsolve.mk (88%) rename {lpsolve => external/lpsolve}/README (100%) rename {lpsolve => external/lpsolve}/UnpackedTarball_lpsolve.mk (80%) rename {lpsolve => external/lpsolve}/ccc.static (100%) rename {lpsolve => external/lpsolve}/lp_solve-aix.patch (100%) rename {lpsolve => external/lpsolve}/lp_solve-fixed-warn.patch (100%) rename {lpsolve => external/lpsolve}/lp_solve_5.5-windows.patch (100%) rename {lpsolve => external/lpsolve}/lp_solve_5.5.patch (100%) 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 similarity index 100% rename from lpsolve/ExternalPackage_lpsolve.mk rename to external/lpsolve/ExternalPackage_lpsolve.mk diff --git a/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk similarity index 100% rename from lpsolve/ExternalProject_lpsolve.mk rename to external/lpsolve/ExternalProject_lpsolve.mk diff --git a/lpsolve/Makefile b/external/lpsolve/Makefile similarity index 71% rename from lpsolve/Makefile rename to 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 similarity index 88% rename from lpsolve/Module_lpsolve.mk rename to 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 similarity index 100% rename from lpsolve/README rename to external/lpsolve/README diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/external/lpsolve/UnpackedTarball_lpsolve.mk similarity index 80% rename from lpsolve/UnpackedTarball_lpsolve.mk rename to 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 similarity index 100% rename from lpsolve/ccc.static rename to external/lpsolve/ccc.static diff --git a/lpsolve/lp_solve-aix.patch b/external/lpsolve/lp_solve-aix.patch similarity index 100% rename from lpsolve/lp_solve-aix.patch rename to external/lpsolve/lp_solve-aix.patch diff --git a/lpsolve/lp_solve-fixed-warn.patch b/external/lpsolve/lp_solve-fixed-warn.patch similarity index 100% rename from lpsolve/lp_solve-fixed-warn.patch rename to 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 similarity index 100% rename from lpsolve/lp_solve_5.5-windows.patch rename to 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 similarity index 100% rename from lpsolve/lp_solve_5.5.patch rename to external/lpsolve/lp_solve_5.5.patch