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_swui.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_swui.mk')
| -rw-r--r-- | sw/Library_swui.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 386a10cf5d4d..c46b6035347a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Library_Library,swui)) $(eval $(call gb_Library_set_include,swui,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ + -I$(realpath $(SRCDIR)/sw/inc) \ + -I$(realpath $(SRCDIR)/sw/inc/pch) \ + -I$(realpath $(SRCDIR)/sw/source/core/inc) \ + -I$(realpath $(SRCDIR)/sw/source/filter/inc) \ + -I$(realpath $(SRCDIR)/sw/source/ui/inc) \ -I$(WORKDIR)/SdiTarget/sw/sdi \ -I$(WORKDIR)/Misc/sw \ $$(INCLUDE) \ @@ -49,14 +49,13 @@ $(eval $(call gb_Library_add_linked_libs,swui,\ sal \ sfx \ sot \ - stl \ svl \ svt \ svx \ svx \ svxcore \ sw \ - swd \ + swd \ tk \ tl \ ucbhelper \ @@ -66,7 +65,6 @@ $(eval $(call gb_Library_add_linked_libs,swui,\ )) $(eval $(call gb_Library_add_exception_objects,swui,\ - sw/source/core/undo/SwRewriter \ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ sw/source/ui/chrdlg/drpcps \ @@ -151,6 +149,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/misc/pggrid \ sw/source/ui/misc/srtdlg \ sw/source/ui/misc/swmodalredlineacceptdlg \ + sw/source/ui/misc/titlepage \ sw/source/ui/table/colwd \ sw/source/ui/table/convert \ sw/source/ui/table/instable \ |