[Libreoffice-commits] .: Branch 'feature/gnumake4' - automation/util extensions/source

[Bjoern Michaelsen]

 automation/util/makefile.mk           |   18 +++++++++---------
 extensions/source/abpilot/makefile.mk |   27 ++++++++++++++-------------
 2 files changed, 23 insertions(+), 22 deletions(-)

New commits:
commit 1008123fce5ae5cffcbb11dff99d31453258f7db
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 21:30:02 2011 +0200

    postmerge fixes for gnumake4

diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 046f6e0..fbbe474 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -49,18 +49,18 @@ SHL1TARGET= sts$(DLLPOSTFIX)
 SHL1IMPLIB= ists
 
 SHL1STDLIBS= \
-            $(TOOLSLIB) \
-            $(UNOTOOLSLIB) \
-            $(SVTOOLLIB) \
-            $(SVLLIB)       \
-            $(VCLLIB) \
             $(BASICLIB) \
-            $(SALLIB) \
+            $(COMPHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
-            $(COMPHELPERLIB) \
-            $(SOTLIB)
-
+            $(SALLIB) \
+            $(SOTLIB) \
+            $(SVLLIB) \
+            $(SVTLIB) \
+            $(SVTOOLLIB) \
+            $(TOOLSLIB) \
+            $(UNOTOOLSLIB) \
+            $(VCLLIB) \
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= \
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index b205d9b..7f84828 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -79,19 +79,20 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
-        $(VCLLIB)			\
-        $(SALLIB)			\
-        $(TOOLSLIB)			\
-        $(CPPULIB) 			\
-        $(SVTOOLLIB)		\
-        $(SVLLIB)			\
-        $(SFXLIB)			\
-        $(CPPUHELPERLIB)	\
-        $(COMPHELPERLIB)	\
-        $(TKLIB)			\
-        $(UNOTOOLSLIB)		\
-        $(SVXCORELIB)		\
-        $(SVXLIB)
+        $(COMPHELPERLIB) \
+        $(CPPUHELPERLIB) \
+        $(CPPULIB) \
+        $(SALLIB) \
+        $(SFXLIB) \
+        $(SVLLIB) \
+        $(SVTLIB) \
+        $(SVTOOLLIB) \
+        $(SVXCORELIB) \
+        $(SVXLIB) \
+        $(TKLIB) \
+        $(TOOLSLIB) \
+        $(UNOTOOLSLIB) \
+        $(VCLLIB) \
 
 SHL1LIBS=		$(SLB)$/$(TARGET).lib
 SHL1IMPLIB=		i$(TARGET)