diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-01-26 10:30:19 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-01-26 10:30:19 +0100 |
| commit | f81812464c6504831b8bddaabfe25876a0906488 (patch) | |
| tree | c54e3b0790f23428b1aba8bc848830a568ec3552 /sw | |
| parent | abd28b0352a654d43aeeb6a034370cf265fa93cc (diff) | |
CWS gnumake3: several clean ups and fixes in makefiles
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Library_swd.mk | 1 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 1 | ||||
| -rw-r--r-- | sw/Library_vbaswobj.mk | 5 | ||||
| -rw-r--r-- | sw/Module_sw.mk | 7 |
4 files changed, 6 insertions, 8 deletions
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 451e99143878..fb84b2848ae8 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ - -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index cf964844232a..22430501f810 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,swui,\ -I$(WORKDIR)/SdiTarget/sw/sdi \ -I$(WORKDIR)/Misc/sw \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 06a42ebe9bf0..8bbb6255452f 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -41,11 +41,6 @@ $(eval $(call gb_Library_set_include,vbaswobj,\ -I$(OUTDIR)/inc/ \ )) -$(eval $(call gb_Library_set_defs,vbaswobj,\ - $$(DEFS) \ - -DVBA_OOBUILD_HACK \ -)) - $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ comphelper \ cppu \ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index c6257e22fc93..5f6c7d9ac3c9 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -33,12 +33,17 @@ $(eval $(call gb_Module_add_targets,sw,\ Library_sw \ Library_swd \ Library_swui \ - Library_vbaswobj \ Package_misc \ Package_uiconfig \ Package_xml \ )) +ifeq ($(strip $(ENABLE_VBA)),YES) +$(eval $(call gb_Module_add_targets,sw,\ + Library_vbaswobj \ +)) +endif + $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ JunitTest_sw_complex \ JunitTest_sw_unoapi \ |