diff options
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 10 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Repository.mk b/Repository.mk index 4a7e1848147f..15c34813c550 100644 --- a/Repository.mk +++ b/Repository.mk @@ -230,7 +230,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ dba \ dbase \ dbmm \ - dbtools \ + $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ deploymentmisc \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ @@ -385,8 +385,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ textconversiondlgs \ textfd \ updatecheckui \ - $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ - vbahelper) \ + $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_gen \ vclplug_gtk \ vclplug_gtk3 \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index a6b9367c1aee..1ee99551da38 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -143,14 +143,4 @@ endif # ifeq ($(COM),GCC) endif # ifeq ($(OS),WNT) -ifeq (,$(filter SCRIPTING,$(BUILD_TYPE))) - -gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES)) - -endif - -ifeq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) -gb_Library_FILENAMES := $(patsubst dbtools:libdbtools%,,$(gb_Library_FILENAMES)) -endif - # vim: set noet sw=4 ts=4: |