diff options
-rw-r--r-- | sot/Library_sot.mk | 28 | ||||
-rwxr-xr-x | sot/prj/build.lst | 3 | ||||
-rw-r--r-- | svl/Library_svl.mk | 4 | ||||
-rw-r--r-- | toolkit/Library_tk.mk | 2 | ||||
-rw-r--r-- | tools/Library_tl.mk | 3 |
5 files changed, 12 insertions, 28 deletions
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index c5d8677bf2ca..5201312e05e1 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -34,11 +34,9 @@ $(eval $(call gb_Library_add_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precom $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot)) $(eval $(call gb_Library_set_include,sot,\ - -I$(SRCDIR)/sot/inc \ -I$(SRCDIR)/sot/inc/pch \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,sot,\ @@ -53,39 +51,31 @@ $(eval $(call gb_Library_add_linked_libs,sot,\ sal \ tl \ ucbhelper \ + stl \ utl \ )) $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ - sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ sot/source/base/formats \ sot/source/base/object \ sot/source/base/exchange \ sot/source/base/filelist \ sot/source/base/factory \ - sot/source/sdstor/stgio \ - sot/source/sdstor/stgavl \ - sot/source/sdstor/stgio \ - sot/source/sdstor/storage \ - sot/source/sdstor/stgavl \ - sot/source/sdstor/ucbstorage \ - sot/source/sdstor/storinfo \ sot/source/sdstor/stg \ + sot/source/sdstor/stgavl \ sot/source/sdstor/stgcache \ - sot/source/sdstor/stgelem \ - sot/source/sdstor/stgstrms \ - sot/source/sdstor/stgstrms \ - sot/source/sdstor/stgelem \ - sot/source/sdstor/stgcache \ - sot/source/sdstor/stgole \ - sot/source/sdstor/unostorageholder \ sot/source/sdstor/stgdir \ + sot/source/sdstor/stgelem \ + sot/source/sdstor/stgio \ sot/source/sdstor/stgole \ - sot/source/sdstor/stgdir \ + sot/source/sdstor/stgstrms \ + sot/source/sdstor/storage \ + sot/source/sdstor/storinfo \ + sot/source/sdstor/ucbstorage \ sot/source/sdstor/unostorageholder \ - )) +)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,sot,\ diff --git a/sot/prj/build.lst b/sot/prj/build.lst new file mode 100755 index 000000000000..30c66df950ed --- /dev/null +++ b/sot/prj/build.lst @@ -0,0 +1,3 @@ +to sot : tools ucbhelper unotools NULL +to sot usr1 - all sot_mkout NULL +to sot\prj nmake - all sot_prj NULL diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index b48d13441d67..605280eefe16 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -35,13 +35,9 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ $$(SOLARINC) \ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svl/inc \ -I$(SRCDIR)/svl/source/inc \ -I$(SRCDIR)/svl/inc/pch \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,svl,\ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 06d0377c5411..abf06ac8fa35 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -35,11 +35,9 @@ $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ - -I$(WORKDIR)/inc/toolkit/ \ -I$(SRCDIR)/toolkit/inc \ -I$(SRCDIR)/toolkit/inc/pch \ -I$(SRCDIR)/toolkit/source \ - -I$(OUTDIR)/inc/toolkit \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index fe91657e42f4..a4f57ed2d239 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -33,13 +33,10 @@ $(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/preco $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/tools \ -I$(SRCDIR)/tools/inc \ -I$(SRCDIR)/tools/inc/pch \ -I$(SRCDIR)/solenv/inc \ -I$(SRCDIR)/solenv/inc/Xp31 \ - -I$(OUTDIR)/inc/tools \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/stl \ )) |