diff options
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 1 |
9 files changed, 5 insertions, 14 deletions
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index d8bc254d58d9..91e652146d3e 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -70,6 +70,7 @@ $(call gb_Helper_abbreviate_dirs,\ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ + $(if $(ENABLE_JAVA),-DENABLE_JAVA) \ $(SCP_SOURCE) > $(1) \ ) endef diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 496a402fcaaf..2dea0b2f4aba 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -46,7 +46,7 @@ gb_EXTRAMERGEDLIBS := \ fwm \ graphicfilter \ guesslang \ - $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ + $(if $(ENABLE_JAVA),hsqldb) \ hyphen \ icd \ icg \ @@ -60,7 +60,7 @@ gb_EXTRAMERGEDLIBS := \ ira \ itg \ iti \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(if $(ENABLE_JAVA),jdbc) \ $(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \ lnth \ $(if $(filter-out ANDROID IOS,$(OS)),log) \ @@ -166,8 +166,8 @@ gb_URELIBS := \ cppu \ cppuhelper \ introspection \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ - $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ reflection \ reg \ sal \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b320cf4cc403..1c5dcfaf51a9 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -225,10 +225,6 @@ gb_GLOBALDEFS += -D_DEBUG endif endif -ifneq ($(strip $(SOLAR_JAVA)),) -gb_GLOBALDEFS += -DSOLAR_JAVA -endif - ifeq ($(gb_TIMELOG),1) gb_GLOBALDEFS += -DTIMELOG \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 33217b4c2546..a2511781c47a 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -229,7 +229,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3d3791501ed5..f5d299faf362 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -510,7 +510,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=MSC \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 893c203b11a4..6035c673dee7 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -334,7 +334,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index d0bbc71a3164..7cc710a72c1c 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -342,7 +342,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 3c633c1718d9..26a1c699686f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -364,7 +364,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0a2c53d99f9b..18f2493d8ea1 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -361,7 +361,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ -DSHORTSTDC3=$(gb_SHORTSTDC3) \ -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \ -D_gcc3 \ - $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) endef |