diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
| commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
| tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/Library_msword.mk | |
| parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
| parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/Library_msword.mk')
| -rw-r--r-- | sw/Library_msword.mk | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index b59967db2930..e90639e18104 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -30,14 +30,15 @@ $(eval $(call gb_Library_Library,msword)) $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword)) $(eval $(call gb_Library_set_include,msword,\ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/inc \ + -I$(realpath $(SRCDIR)/sw/source/core/inc) \ + -I$(realpath $(SRCDIR)/sw/source/ui/inc) \ + -I$(realpath $(SRCDIR)/sw/source/filter/inc) \ + -I$(realpath $(SRCDIR)/sw/inc/pch) \ + -I$(realpath $(SRCDIR)/sw/inc) \ -I$(WORKDIR)/inc/sw/sdi \ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ + $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/sw \ )) @@ -52,13 +53,14 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ i18nutil \ msfilter \ sal \ + sax \ + sb \ + oox \ sfx \ sot \ - stl \ svl \ svt \ svx \ - svx \ svxcore \ sw \ tk \ @@ -77,6 +79,9 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ sw/source/filter/rtf/rtfnum \ sw/source/filter/rtf/rtftbl \ sw/source/filter/rtf/swparrtf \ + sw/source/filter/ww8/docxattributeoutput \ + sw/source/filter/ww8/docxexport \ + sw/source/filter/ww8/docxexportfilter \ sw/source/filter/ww8/rtfattributeoutput \ sw/source/filter/ww8/rtfexport \ sw/source/filter/ww8/rtfexportfilter \ @@ -108,6 +113,14 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ sw/source/filter/ww8/ww8par5 \ sw/source/filter/ww8/ww8par6 \ sw/source/filter/ww8/ww8scan \ + sw/source/filter/ww8/ww8toolbar \ )) +# TODO: This should be really fixed in writerfilter so the header is +# delivered before compilation starts. +$(call gb_CxxObject_get_target,sw/source/filter/ww8/wrtw8nds) \ +$(call gb_CxxObject_get_target,sw/source/filter/ww8/wrtww8gr) \ +$(call gb_CxxObject_get_target,sw/source/filter/ww8/ww8atr) \ + : $(OUTDIR)/inc/writerfilter/doctok/sprmids.hxx + # vim: set noet sw=4 ts=4: |