From 6c0d17b3e21d4c0d6f6a526a6261f5ca8eb42369 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 26 Jan 2011 10:30:19 +0100
Subject: CWS gnumake3: several clean ups and fixes in makefiles

---
 sot/Library_sot.mk | 28 +++++++++-------------------
 sot/prj/build.lst  |  3 +++
 2 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100755 sot/prj/build.lst

(limited to 'sot')

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,11 +51,11 @@ $(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 \
@@ -65,27 +63,19 @@ $(eval $(call gb_Library_add_exception_objects,sot,\
     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
-- 
cgit v1.2.3