diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-04-23 18:14:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-04-23 18:14:35 +0200 |
| commit | 35f456fad71de5fb75192a956533499509875a33 (patch) | |
| tree | 7d026d8be1df35719a27faec9d97b3ea0c64ba32 | |
| parent | 6a8e21e6c2b25631f1492c22bb1057c0120fc4ae (diff) | |
gnumake2: lib_vbaswobj: remove obsolete header gen; guard linux-specific stuff
| -rw-r--r-- | sw/prj/target_lib_vbaswobj.mk | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk index 5e65b253bd47..dc47290491c9 100644 --- a/sw/prj/target_lib_vbaswobj.mk +++ b/sw/prj/target_lib_vbaswobj.mk @@ -45,12 +45,6 @@ $(eval $(call gb_Library_set_defs,vbaswobj,\ -DVBA_OOBUILD_HACK \ )) -$(eval $(call gb_Library_set_ldflags,vbaswobj,\ - $$(LDFLAGS) \ - -Wl$(COMMA)-O1 \ - -Wl$(COMMA)-z$(COMMA)noexecstack \ -)) - $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ comphelper \ cppu \ @@ -120,15 +114,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\ sw/source/ui/vba/wordvbahelper \ )) -$(call gb_Library_get_headers_target,vbaswobj) : $(WORKDIR)/CppuUnpack/vbaswobj -$(call gb_Library_get_clean_target,vbaswobj) : $(WORKDIR)/Clean/CppuUnpack/vbaswobj - -.PHONY : $(WORKDIR)/Clean/CppuUnpack/vbaswobj -$(WORKDIR)/Clean/CppuUnpack/vbaswobj : - -$(call gb_Helper_abbreviate_dirs,\ - rm -rf $(WORKDIR)/inc/sw/vbaswobj $(WORKDIR)/CppuUnpack/vbaswobj) - -$(WORKDIR)/CppuUnpack/vbaswobj : | $(gb_CppuTarget_CPPUMAKERTARGET) - $(call gb_Helper_abbreviate_dirs,\ - $(gb_CppuTarget_CPPUMAKERCOMMAND) -O$(WORKDIR)/inc/sw/vbaswobj -BUCR $(OUTDIR)/bin/oovbaapi.rdb -X$(OUTDIR)/bin/types.rdb && mkdir -p $(dir $@) && touch $@) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_set_ldflags,vbaswobj,\ + $$(LDFLAGS) \ + -Wl$(COMMA)-O1 \ + -Wl$(COMMA)-z$(COMMA)noexecstack \ +)) +endif |