diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:34:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:34:59 +0000 |
| commit | 0da8dda4cd0a2ea82aab702006956e169ab27b6f (patch) | |
| tree | 6e754d7f2dff30e1593967f0f1bc631f460adcfb /soldep | |
| parent | 9d8c9317fb8470f0d001d6a69e2d5704209bbc49 (diff) | |
INTEGRATION: CWS ause076 (1.12.6); FILE MERGED
2007/02/28 16:43:00 hjs 1.12.6.2: #i74984# less forced shell calls
2007/02/28 11:02:14 hjs 1.12.6.1: #i74812# cleanup *LIB and more
Diffstat (limited to 'soldep')
| -rw-r--r-- | soldep/source/makefile.mk | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk index 71197fd2553b..96cda452b515 100644 --- a/soldep/source/makefile.mk +++ b/soldep/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: ihi $ $Date: 2006-12-21 12:22:33 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:34:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,21 +67,19 @@ SHL1DEPN =$(SHL1LIBS) SHL1STDLIBS = $(SVTOOLLIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(SVLIB) \ + $(VCLLIB) \ $(SOTLIB) \ $(BTSTRPLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ - $(UNOLIB) \ - $(OSLLIB) \ $(SALLIB) \ $(CPPULIB) \ $(PERL_LIB) -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=\ - $(SALLIB) -.ENDIF +#.IF "$(GUI)" == "UNX" +#SHL1STDLIBS+=\ +# $(SALLIB) +#.ENDIF DEF1NAME =$(SHL1TARGET) @@ -109,13 +107,11 @@ APP1STDLIBS= \ $(SVTOOLLIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(SVLIB) \ + $(VCLLIB) \ $(SOTLIB) \ $(BTSTRPLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ - $(UNOLIB) \ - $(OSLLIB) \ $(SALLIB) \ $(CPPULIB) \ $(PERL_LIB) @@ -136,8 +132,8 @@ ALLTAR : $(BIN)$/applicat.rdb $(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB) rm -f $@ $(GNUCOPY) $(UNOUCRRDB) $@ - +cd $(BIN) && \ - regcomp -register -r applicat.rdb \ + cd $(BIN) && \ + $(REGCOMP) -register -r applicat.rdb \ -c i18nsearch.uno$(DLLPOST) \ -c i18npool.uno$(DLLPOST) |