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 | 98f7d406968f0e55acbcc5c8b0a43805f41a367a (patch) | |
| tree | b187a2412cb6074145513bfa3a8e7216a05a37f8 /automation | |
| parent | resyncing to master (diff) | |
| download | core-98f7d406968f0e55acbcc5c8b0a43805f41a367a.tar.gz core-98f7d406968f0e55acbcc5c8b0a43805f41a367a.zip | |
postmerge fixes for gnumake4
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/util/makefile.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 046f6e043dea..fbbe47454717 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+= \ |