diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:30:02 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:30:02 +0200 |
| commit | 1008123fce5ae5cffcbb11dff99d31453258f7db (patch) | |
| tree | 14c4d9162bc82ee6f54c77cb52dd1ca4958782aa | |
| parent | adf7c3b1c101c080f1813ea5422386d2324fa977 (diff) | |
postmerge fixes for gnumake4
| -rw-r--r-- | automation/util/makefile.mk | 18 | ||||
| -rw-r--r-- | extensions/source/abpilot/makefile.mk | 27 |
2 files changed, 23 insertions, 22 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 046f6e043..fbbe47454 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 b205d9b3f..7f8482824 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) |