diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-01-26 10:30:19 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-01-26 10:30:19 +0100 |
| commit | 6c0d17b3e21d4c0d6f6a526a6261f5ca8eb42369 (patch) | |
| tree | ba5ef2dc5aa0cb0f99a5460d83618020c2df2b7b /sot | |
| parent | 5ede6609549b11eb205e080341438bed5f9858e0 (diff) | |
CWS gnumake3: several clean ups and fixes in makefiles
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/Library_sot.mk | 28 | ||||
| -rwxr-xr-x | sot/prj/build.lst | 3 |
2 files changed, 12 insertions, 19 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 |