diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /automation/util/makefile.mk | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'automation/util/makefile.mk')
| -rw-r--r-- | automation/util/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 756a3d6a62e4..046f6e043dea 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -55,7 +55,6 @@ SHL1STDLIBS= \ $(SVLLIB) \ $(VCLLIB) \ $(BASICLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ @@ -86,7 +85,6 @@ SHL2IMPLIB= isimplecm SHL2STDLIBS= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) @@ -109,9 +107,7 @@ SHL3STDLIBS= \ $(TOOLSLIB) \ $(SVLLIB) \ $(VCLLIB) \ - $(VOSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SIMPLECMLIB) @@ -153,7 +149,6 @@ APP1STDLIBS+= \ $(SVLLIB) \ $(VCLLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(UCBHELPERLIB) \ $(COMPHELPERLIB) \ $(BASICLIB) \ @@ -162,7 +157,7 @@ APP1STDLIBS+= \ .IF "$(GUI)"=="UNX" APP1STDLIBS+= \ - $(VOSLIB) $(SALLIB) $(BASICLIB) + $(SALLIB) $(BASICLIB) APP1STDLIBS+=$(CPPULIB) .ENDIF .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC" @@ -219,13 +214,8 @@ APP3STDLIBS= \ $(VCLLIB) .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="MACOSX" -APP3STDLIBS+= \ - $(VOSLIB) $(SALLIB) $(LIBSTLPORT) -.ELSE APP3STDLIBS+= \ - $(VOSLIB) $(SALLIB) -.ENDIF + $(SALLIB) .ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET .IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") |