diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 12:02:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 12:02:15 +0000 |
| commit | 9df48606c41dffad982616d809764779183d98a6 (patch) | |
| tree | de853ee0e6d13dc78883faf35a9c734e590b0f44 /stoc | |
| parent | dad73ed4f8d13e09c89409b268f17a89bd205c6f (diff) | |
INTEGRATION: CWS sb76 (1.10.56); FILE MERGED
2007/08/31 11:01:54 sb 1.10.56.1: #i77885# Consolidate stoc libraries; patch by jnavrati.
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/loader/makefile.mk | 28 | ||||
| -rw-r--r-- | stoc/source/servicemanager/makefile.mk | 28 |
2 files changed, 10 insertions, 46 deletions
diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk index 1b2c663f194a..51b96be025aa 100644 --- a/stoc/source/loader/makefile.mk +++ b/stoc/source/loader/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2006-05-24 13:48:43 $ +# last change: $Author: hr $ $Date: 2007-09-27 12:59:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -34,39 +34,21 @@ #************************************************************************* PRJ=..$/.. -PRJNAME= stoc -TARGET = shlibloader.uno +PRJNAME= stoc +TARGET = shlibloader ENABLE_EXCEPTIONS=TRUE BOOTSTRAP_SERVICE=TRUE -COMP1TYPELIST = cpld +UNOUCROUT= $(OUT)$/inc$/bootstrap # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -DLLPRE = # ------------------------------------------------------------------ -.INCLUDE : ..$/cppumaker.mk - SLOFILES= \ $(SLO)$/dllcomponentloader.obj -SHL1TARGET= $(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1VERSIONMAP = cpld.map -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk index a6b5f83a0ad8..e22c03744bdc 100644 --- a/stoc/source/servicemanager/makefile.mk +++ b/stoc/source/servicemanager/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2006-05-24 13:51:32 $ +# last change: $Author: hr $ $Date: 2007-09-27 13:02:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -34,39 +34,21 @@ #************************************************************************* PRJ=..$/.. -PRJNAME= stoc -TARGET = servicemgr.uno +PRJNAME= stoc +TARGET = servicemgr ENABLE_EXCEPTIONS=TRUE BOOTSTRAP_SERVICE=TRUE -COMP1TYPELIST = smgr +UNOUCROUT=$(OUT)$/inc$/bootstrap # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -DLLPRE = # ------------------------------------------------------------------ -.INCLUDE : ..$/cppumaker.mk - SLOFILES= \ $(SLO)$/servicemanager.obj -SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = smgr.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |