From c6407908810ab208d95d6c2c9c4a152bc7f767c4 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 19 Jan 2011 13:21:26 +0100 Subject: CWS gnumake3: repair windows build; convert svx to gbuild --- Module_ooo.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Module_ooo.mk') diff --git a/Module_ooo.mk b/Module_ooo.mk index bc8d42079993..cc3b2c35a20d 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sfx2 \ svl \ svtools \ + svx \ sw \ toolkit \ tools \ -- cgit v1.2.3 From b83f838807733b1eb1337ade8fbef9064357d510 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 08:56:46 +0100 Subject: CWS gnumake3: convert editeng module to gbuild --- Module_ooo.mk | 2 ++ Repository.mk | 2 ++ 2 files changed, 4 insertions(+) (limited to 'Module_ooo.mk') diff --git a/Module_ooo.mk b/Module_ooo.mk index cc3b2c35a20d..aa6d03a6fa45 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ + editeng \ framework \ sfx2 \ svl \ @@ -37,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ toolkit \ tools \ xmloff \ + vbahelper \ )) # vim: set noet ts=4 sw=4: diff --git a/Repository.mk b/Repository.mk index 6c5b0152685f..cc14cc00b6eb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ + i18npaper \ lng \ msfilter \ msword \ @@ -109,6 +110,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ passwordcontainer \ productregistration \ vbaswobj \ + msforms \ )) -- cgit v1.2.3 From c501793e09620701d76cf981a397cc3c428e3071 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 26 Jan 2011 10:30:19 +0100 Subject: CWS gnumake3: several clean ups and fixes in makefiles --- Module_ooo.mk | 1 + solenv/gbuild/gbuild.mk | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'Module_ooo.mk') diff --git a/Module_ooo.mk b/Module_ooo.mk index aa6d03a6fa45..7b8c70e837b0 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ editeng \ framework \ sfx2 \ + sot \ svl \ svtools \ svx \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 7418654b14c8..93122c465686 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -193,6 +193,10 @@ ifeq ($(strip $(ENABLE_VBA)),YES) gb_GLOBALDEFS += -DENABLE_VBA endif +ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) +gb_GLOBALDEFS += -DENABLE_GRAPHITE +endif + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) include $(GBUILDDIR)/Deliver.mk -- cgit v1.2.3 From e1171c154cf5b74a19aabc6dc137784a1a5096e6 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Wed, 26 Jan 2011 12:32:27 +0100 Subject: gnumake3: adjust comphelper to new build env --- Module_ooo.mk | 3 ++- Repository.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'Module_ooo.mk') diff --git a/Module_ooo.mk b/Module_ooo.mk index 7b8c70e837b0..b2605d0b909a 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -28,7 +28,8 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ - editeng \ + comphelper \ + editeng \ framework \ sfx2 \ sot \ diff --git a/Repository.mk b/Repository.mk index cc14cc00b6eb..da9663362c09 100644 --- a/Repository.mk +++ b/Repository.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ + comphelp4 \ cui \ drawinglayer \ editeng \ -- cgit v1.2.3