diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
| commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
| tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /editeng/Library_editeng.mk | |
| parent | fixing rebase errors (diff) | |
| parent | remove unused define (diff) | |
| download | core-92667c8edbaee9a252b1d5d221eb62849f76697c.tar.gz core-92667c8edbaee9a252b1d5d221eb62849f76697c.zip | |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'editeng/Library_editeng.mk')
| -rwxr-xr-x | editeng/Library_editeng.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 45683df80d78..f5444d378ec6 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pc $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ - -I$(SRCDIR)/editeng/inc/pch \ - -I$(SRCDIR)/editeng/inc \ + -I$(realpath $(SRCDIR)/editeng/inc/pch) \ + -I$(realpath $(SRCDIR)/editeng/inc) \ -I$(OUTDIR)/inc/offuh \ )) @@ -80,11 +80,13 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\ editeng/source/editeng/impedit4 \ editeng/source/editeng/impedit5 \ editeng/source/editeng/textconv \ + editeng/source/items/borderline \ editeng/source/items/bulitem \ editeng/source/items/charhiddenitem \ editeng/source/items/flditem \ editeng/source/items/frmitems \ editeng/source/items/itemtype \ + editeng/source/items/justifyitem \ editeng/source/items/numitem \ editeng/source/items/optitems \ editeng/source/items/paperinf \ @@ -145,7 +147,6 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ tk \ vcl \ svl \ - stl \ sot \ utl \ tl \ @@ -153,8 +154,8 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ ucbhelper \ cppuhelper \ cppu \ - vos3 \ sal \ + salhelper \ i18nisolang1 \ i18npaper \ $(gb_STDLIBS) \ |