From 40888a9896a6dffed8235e592a78f87391aa1a86 Mon Sep 17 00:00:00 2001
From: Martin Hollmichel <mh@openoffice.org>
Date: Wed, 23 Oct 2002 05:05:36 +0000
Subject: [PATCH] join: from OOO_STABLE_1

---
 idl/util/makefile.mk | 44 ++++----------------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/idl/util/makefile.mk b/idl/util/makefile.mk
index b4161ec45e82..0c22c02d0b74 100644
--- a/idl/util/makefile.mk
+++ b/idl/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 16:30:41 $
+#   last change: $Author: mh $ $Date: 2002-10-23 06:05:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -55,18 +55,17 @@
 #   All Rights Reserved.
 #
 #   Contributor(s): _______________________________________
+#			Martin Blapp (mbr@openoffice.org)
 #
 #
 #
 #*************************************************************************
 
 PRJ=..
-
 PRJPCH=
 
 PRJNAME=SVIDL
 TARGET=idl
-VERSION=$(UPD)
 
 TARGETTYPE=CUI
 
@@ -83,34 +82,20 @@ LIB1FILES = $(LB)$/prj.lib		 \
             $(LB)$/objects.lib	 \
             $(LB)$/cmptools.lib
 
-.IF "$(GUI)" != "WIN"
 APP1TARGET= svidl
 
-.IF "$(GUI)" != "MAC"
 APP1DEPN=       $(L)$/itools.lib
-.ENDIF
 
 APP1STDLIBS=\
                 $(TOOLSLIB)
 
 APP1LIBS=	$(LIBPRE) $(LB)$/$(TARGET).lib
 .IF "$(GUI)" != "UNX"
-.IF "$(COM)"=="WTC"
-APP1OBJS=	$(OBJ)$/svidl.obj
-.ELSE
 APP1OBJS=	$(OBJ)$/svidl.obj	\
             $(OBJ)$/command.obj
 .ENDIF
-.ENDIF
-.IF "$(COM)" == "WTC"
-APP1STACK=32768
-.ENDIF
-.IF "$(GUI)" != "OS2"
-APP1STACK=32768
-.ENDIF
-.ENDIF
 
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
 APP1STDLIBS+=-lcrypt
 .ENDIF
 
@@ -118,28 +103,8 @@ APP1STDLIBS+=-lcrypt
 
 .INCLUDE :  target.mk
 
-# -------------------------------------------------------------------
-# PM2
-# -------------------------------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-
-$(MISC)$/$(APP1TARGET).def : makefile
-    echo  NAME			SV-IDL WINDOWCOMPAT 				>$@
-    echo  DESCRIPTION	'SV-IDL-Compiler'                  >>$@
-.IF "$(COM)" != "BLC"
-    echo  STUB			'os2STUB.EXE'                      >>$@
-.ENDIF
-    echo  DATA			MULTIPLE						   >>$@
-    echo  EXETYPE		OS2 							   >>$@
-    echo  PROTMODE										   >>$@
-    echo  HEAPSIZE		16000							   >>$@
-    echo  STACKSIZE 	48000							   >>$@
-.ENDIF
-
 # --- Filter-Datei ---
 
-.IF "$(GUI)" != "DOS"
 $(MISC)$/$(SHL1TARGET).flt: makefile
     @echo ------------------------------
     @echo Making: $@
@@ -147,5 +112,4 @@ $(MISC)$/$(SHL1TARGET).flt: makefile
     @echo LIBMAIN>>$@
     @echo LibMain>>$@
     @echo Stg>>$@
-.ENDIF