merge from src641 internal ODK release

3 files changed, 27 insertions, 26 deletions

diff --git a/udkapi/util/makefile.mk b/udkapi/util/makefile.mk
index adaa79f027fa..fb47f5f07aee 100644
--- a/udkapi/util/makefile.mk
+++ b/udkapi/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: mi $ $Date: 2002-11-20 15:03:06 $
+#   last change: $Author: mi $ $Date: 2003-01-21 13:17:35 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,8 +76,6 @@ TARGET=udkapi
 # ------------------------------------------------------------------
 
 UNOIDLDBFILES= \
-    $(UCR)$/css.db \
-    $(UCR)$/cssutil.db \
     $(UCR)$/cssbeans.db \
     $(UCR)$/cssbridge.db \
     $(UCR)$/cssconnection.db\
@@ -85,7 +83,6 @@ UNOIDLDBFILES= \
     $(UCR)$/cssio.db \
     $(UCR)$/cssjava.db \
     $(UCR)$/csslang.db \
-    $(UCR)$/csssec.db \
     $(UCR)$/cssloader.db \
     $(UCR)$/cssreflection.db \
     $(UCR)$/cssregistry.db \
@@ -94,22 +91,13 @@ UNOIDLDBFILES= \
     $(UCR)$/cssperftest.db \
     $(UCR)$/cssbridgetest.db \
     $(UCR)$/cssuno.db \
-    $(UCR)$/cssulog.db \
     $(UCR)$/csscorba.db \
     $(UCR)$/cssiop.db \
     $(UCR)$/cssiiop.db \
-    $(UCR)$/cssgiop.db \
-    $(UCR)$/csstask.db
+    $(UCR)$/cssgiop.db 
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-ALLTAR: autodoc
-
-autodoc: $(OUT)$/misc$/udkapi.autodoc
-
-$(OUT)$/misc$/udkapi.autodoc: 
-    $(shell sed "p" $(OUT)$/misc$/*.idls | tr "[:cntrl:] " "\n\n" | sed -f autodoc.sed >$@)
-    echo "$@ done"
 
diff --git a/udkapi/util/makefile.pmk b/udkapi/util/makefile.pmk
index 28556f80866f..15377fea78c8 100644
--- a/udkapi/util/makefile.pmk
+++ b/udkapi/util/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: jsc $ $Date: 2001-08-16 13:27:52 $
+#   last change: $Author: mi $ $Date: 2003-01-21 13:17:35 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,9 +60,24 @@
 #
 #*************************************************************************
 
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=sjpch
+#PROJECTPCHSOURCE=$(PRJ)$/util\sjpch
+#PDBTARGET=sj
+PRJPCH=
+ENABLE_EXCEPTIONS=TRUE
+
+JAVAPREPRO=
+.IF "$(JDK_VERSION)" == "110"
+JAVAPREPRO=-jdk11
+.ENDIF
+.IF "$(PRODUCT)" != ""
+JAVAPREPRO=$(JAVAPREPRO) + " -product"
+.ENDIF
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.INCLUDE :  sv.mk
 
 NOUNODOC=
 BUILD_URD_ONLY=TRUE
@@ -70,4 +85,9 @@ LOCALIDLFILES=TRUE
 
 URDDOC=TRUE
 
+.IF "$(OS)"=="SOLARIS"
+.IF "$(CPU)"=="I"
+UNOIDL=unoidl
+.ENDIF
+.ENDIF
 
diff --git a/udkapi/util/target.pmk b/udkapi/util/target.pmk
index e1b23e725b78..5827c37c5eb1 100644
--- a/udkapi/util/target.pmk
+++ b/udkapi/util/target.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.pmk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: mi $ $Date: 2002-11-08 12:31:07 $
+#   last change: $Author: mi $ $Date: 2003-01-21 13:17:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,10 +60,3 @@
 #
 #*************************************************************************
 
-$(OUT)$/misc$/$(TARGET).idls: makefile.mk
-    +$(RM) $@
-    +$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
-
-ALLTAR: $(OUT)$/misc$/$(TARGET).idls
-
-