From bcb727995f72ee9dbf4a0fe0cbbb95ae9233161d Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 27 Sep 2007 12:07:20 +0000
Subject: INTEGRATION: CWS sb76 (1.7.16); FILE MERGED 2007/08/31 11:01:56 sb
 1.7.16.1: #i77885# Consolidate stoc libraries; patch by jnavrati.

---
 stoc/source/uriproc/makefile.mk | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'stoc')

diff --git a/stoc/source/uriproc/makefile.mk b/stoc/source/uriproc/makefile.mk
index 9ad8267572fb..a3b70619e541 100644
--- a/stoc/source/uriproc/makefile.mk
+++ b/stoc/source/uriproc/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: obo $ $Date: 2007-03-12 10:56:06 $
+#   last change: $Author: hr $ $Date: 2007-09-27 13:07:20 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -33,31 +33,29 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
-PRJNAME := stoc
-TARGET := uriproc
-
+PRJ=..$/..
+PRJNAME=stoc
+TARGET=uriproc
 ENABLE_EXCEPTIONS := TRUE
 
+# --- openoffice.org.orig/Settings -----------------------------------------------------
+
 .INCLUDE: settings.mk
+DLLPRE = 
+
+# ------------------------------------------------------------------
 
-DLLPRE = # no leading "lib" on .so files
+.INCLUDE :  ..$/cppumaker.mk
 
-SHL1TARGET = $(TARGET).uno
-SHL1OBJS = \
+SLOFILES = \
     $(SLO)$/ExternalUriReferenceTranslator.obj \
     $(SLO)$/UriReference.obj \
     $(SLO)$/UriReferenceFactory.obj \
     $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTexpand.obj \
     $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTscript.obj \
     $(SLO)$/VndSunStarPkgUrlReferenceFactory.obj \
-    $(SLO)$/component.obj \
     $(SLO)$/supportsService.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
 
-SLOFILES = $(SHL1OBJS)
+# ------------------------------------------------------------------
 
 .INCLUDE: target.mk
-- 
cgit