From 4f29c99d102e232791e7ff5aa9daa8f612370f36 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 25 Jan 2007 12:26:28 +0000 Subject: INTEGRATION: CWS ause069 (1.19.68); FILE MERGED 2006/10/11 18:26:53 hjs 1.19.68.1: #i69872# cleanup --- configmgr/util/makefile.mk | 45 ++------------------------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) (limited to 'configmgr/util') diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk index 5ffd188976bf..f2dcd85c6e42 100644 --- a/configmgr/util/makefile.mk +++ b/configmgr/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: rt $ $Date: 2005-09-08 04:44:27 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:26:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -84,47 +84,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp -# --- Library ----------------------------------- -.IF "$(SVXLIGHT)" != "" - -SHL2TARGET= $(CFGMGR_TARGET)$(CFGMGR_MAJOR)l -.IF "$(OS)"=="MACOSX" -#SHL2VERSIONMAP= $(TARGET).$(DLLPOSTFIX).map -.ELSE -SHL2VERSIONMAP= $(TARGET)l.map -.ENDIF -SHL2OBJS=$(SLOFILES) -SHL2STDLIBS=\ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VOSLIB) \ - $(OSLLIB) \ - $(SALHELPERLIB) \ - $(SALLIB) \ - $(CPPRTLLIB) - -# $(UNOTOOLSLIB) \ - -SHL2DEPN= -SHL2IMPLIB= i$(SHL2TARGET) -SHL2LIBS= $(SLB)$/registry.lib \ - $(SLB)$/treecache.lib \ - $(SLB)$/misc.lib \ - $(SLB)$/xml.lib \ - $(SLB)$/treemgr.lib \ - $(SLB)$/api2.lib \ - $(SLB)$/api.lib \ - $(SLB)$/data.lib \ - $(SLB)$/cm.lib - -SHL2DEF= $(MISC)$/$(SHL2TARGET).def - -DEF2NAME= $(SHL2TARGET) -DEF2EXPORTFILE= exports.dxp - -.ENDIF - # --- Targets ---------------------------------- .INCLUDE : target.mk -- cgit