summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jurt/com/sun/star/comp/bridgefactory/makefile.mk17
-rw-r--r--jurt/com/sun/star/comp/connections/makefile.mk12
-rw-r--r--jurt/com/sun/star/comp/loader/makefile.mk25
-rw-r--r--jurt/com/sun/star/comp/servicemanager/makefile.mk17
-rw-r--r--jurt/com/sun/star/comp/urlresolver/makefile.mk10
-rw-r--r--jurt/com/sun/star/lib/connections/socket/makefile.mk14
-rw-r--r--jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk11
-rw-r--r--jurt/com/sun/star/lib/uno/environments/remote/makefile.mk12
-rw-r--r--jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk17
-rw-r--r--jurt/com/sun/star/uno/makefile.mk15
-rw-r--r--jurt/util/makefile.pmk15
11 files changed, 23 insertions, 142 deletions
diff --git a/jurt/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/com/sun/star/comp/bridgefactory/makefile.mk
index ef5cbbe51cda..dd86a6fde0f1 100644
--- a/jurt/com/sun/star/comp/bridgefactory/makefile.mk
+++ b/jurt/com/sun/star/comp/bridgefactory/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: jbu $ $Date: 2000-10-09 07:31:48 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:41 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,19 +71,6 @@ TARGET = com_sun_star_comp_bridgefactory
# --- Files --------------------------------------------------------
-GENJAVAFILES = \
- $(MISC)$/java$/com$/sun$/star$/uno$/XInterface.java \
- $(MISC)$/java$/com$/sun$/star$/bridge$/BridgeExistsException.java \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XBridgeFactory.java \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XBridge.java \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XInstanceProvider.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XEventListener.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XComponent.java \
- $(MISC)$/java$/com$/sun$/star$/container$/NoSuchElementException.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/Exception.java \
- $(MISC)$/java$/com$/sun$/star$/io$/IOException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnection.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/BridgeFactory.class
diff --git a/jurt/com/sun/star/comp/connections/makefile.mk b/jurt/com/sun/star/comp/connections/makefile.mk
index 82a243718b5c..0dd40da0e180 100644
--- a/jurt/com/sun/star/comp/connections/makefile.mk
+++ b/jurt/com/sun/star/comp/connections/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 15:27:51 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,14 +71,6 @@ TARGET = com_sun_star_comp_connections
# --- Files --------------------------------------------------------
-GENJAVAFILES= \
- $(MISC)$/java$/com$/sun$/star$/connection$/AlreadyAcceptingException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/ConnectionSetupException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/NoConnectException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XAcceptor.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnection.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnector.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/Acceptor.class \
$(CLASSDIR)$/$(PACKAGE)$/Connector.class \
diff --git a/jurt/com/sun/star/comp/loader/makefile.mk b/jurt/com/sun/star/comp/loader/makefile.mk
index 8d9d29036715..219bf259df8f 100644
--- a/jurt/com/sun/star/comp/loader/makefile.mk
+++ b/jurt/com/sun/star/comp/loader/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 15:27:51 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,27 +71,6 @@ TARGET = com_sun_star_comp_loader
# --- Files --------------------------------------------------------
-GENJAVAFILES = \
- $(MISC)$/java$/com$/sun$/star$/lang$/IllegalArgumentException.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/ServiceNotRegisteredException.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/WrappedTargetException.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XInitialization.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XMultiServiceFactory.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XServiceInfo.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XSingleServiceFactory.java \
- $(MISC)$/java$/com$/sun$/star$/loader$/CannotActivateFactoryException.java \
- $(MISC)$/java$/com$/sun$/star$/loader$/XImplementationLoader.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/XRegistryKey.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/RegistryValueType.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/RegistryKeyType.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/XSimpleRegistry.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/InvalidRegistryException.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/InvalidValueException.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/MergeConflictException.java \
- $(MISC)$/java$/com$/sun$/star$/registry$/CannotRegisterImplementationException.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/Exception.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/RuntimeException.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/FactoryHelper.class \
$(CLASSDIR)$/$(PACKAGE)$/JavaLoader.class \
diff --git a/jurt/com/sun/star/comp/servicemanager/makefile.mk b/jurt/com/sun/star/comp/servicemanager/makefile.mk
index 70a2ea5e0d73..2d645d377061 100644
--- a/jurt/com/sun/star/comp/servicemanager/makefile.mk
+++ b/jurt/com/sun/star/comp/servicemanager/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 15:27:51 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:44 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,19 +71,6 @@ TARGET = com_sun_star_comp_servicemanager
# --- Files --------------------------------------------------------
-GENJAVAFILES = \
- $(MISC)$/java$/com$/sun$/star$/container$/ElementExistException.java \
- $(MISC)$/java$/com$/sun$/star$/container$/NoSuchElementException.java \
- $(MISC)$/java$/com$/sun$/star$/container$/XSet.java \
- $(MISC)$/java$/com$/sun$/star$/container$/XContentEnumerationAccess.java \
- $(MISC)$/java$/com$/sun$/star$/container$/XEnumeration.java \
- $(MISC)$/java$/com$/sun$/star$/container$/XEnumerationAccess.java \
- $(MISC)$/java$/com$/sun$/star$/container$/XElementAccess.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/EventObject.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XEventListener.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/NoSuchMethodException.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XComponent.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/ServiceManager.class
diff --git a/jurt/com/sun/star/comp/urlresolver/makefile.mk b/jurt/com/sun/star/comp/urlresolver/makefile.mk
index 9fa049fdc016..694ef2c87c2c 100644
--- a/jurt/com/sun/star/comp/urlresolver/makefile.mk
+++ b/jurt/com/sun/star/comp/urlresolver/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 15:27:52 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:45 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,12 +71,6 @@ TARGET = com_sun_star_comp_urlresolver
# Files --------------------------------------------------------
-
-GENJAVAFILES = \
- $(MISC)$/java$/com$/sun$/star$/bridge$/BridgeExistsException.java \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XUnoUrlResolver.java
-
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/UrlResolver.class
diff --git a/jurt/com/sun/star/lib/connections/socket/makefile.mk b/jurt/com/sun/star/lib/connections/socket/makefile.mk
index 0ff371969ab2..69ee1ab5f922 100644
--- a/jurt/com/sun/star/lib/connections/socket/makefile.mk
+++ b/jurt/com/sun/star/lib/connections/socket/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 15:27:52 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:46 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,16 +71,6 @@ TARGET = com_sun_star_connections_socket
# --- Files --------------------------------------------------------
-GENJAVAFILES= \
- $(MISC)$/java$/com$/sun$/star$/connection$/AlreadyAcceptingException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/ConnectionSetupException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/NoConnectException.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XAcceptor.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnection.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnector.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnectionBroadcaster.java \
- $(MISC)$/java$/com$/sun$/star$/io$/XStreamListener.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/socketAcceptor.class \
$(CLASSDIR)$/$(PACKAGE)$/SocketConnection.class \
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
index 64385a946fbf..dc2cb81cbd2d 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/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 15:27:52 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:47 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,13 +71,6 @@ TARGET = com_sun_star_lib_uno_bridges_java_remote
# --- Files --------------------------------------------------------
-GENJAVAFILES= \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XBridge.java \
- $(MISC)$/java$/com$/sun$/star$/connection$/XConnection.java \
- $(MISC)$/java$/com$/sun$/star$/lang/XComponent.java \
- $(MISC)$/java$/com$/sun$/star$/io$/IOException.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/XInterface.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/XConnectionInputStream_Adapter.class \
$(CLASSDIR)$/$(PACKAGE)$/XConnectionOutputStream_Adapter.class \
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk
index 2063e4575540..1fec03e7d7ba 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk
+++ b/jurt/com/sun/star/lib/uno/environments/remote/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 15:27:53 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:48 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,14 +71,6 @@ TARGET = com_sun_star_lib_uno_environments_remote
# --- Files --------------------------------------------------------
-GENJAVAFILES= \
- $(MISC)$/java$/com$/sun$/star$/bridge$/XInstanceProvider.java \
- $(MISC)$/java$/com$/sun$/star$/container$/NoSuchElementException.java \
- $(MISC)$/java$/com$/sun$/star$/corba$/giop$/ReplyStatusType_1_2.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/Exception.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/RuntimeException.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/XInterface.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/IMarshal.class \
$(CLASSDIR)$/$(PACKAGE)$/IMessage.class \
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk
index 07670a04353c..0139384e5248 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/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 15:27:53 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:51 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,19 +71,6 @@ TARGET = com_sun_star_lib_uno_protocols_urp
# --- Files --------------------------------------------------------
-GENJAVAFILES= \
- $(MISC)$/java$/com$/sun$/star$/lang$/EventObject.java \
- $(MISC)$/java$/com$/sun$/star$/lang$/XEventListener.java \
- $(MISC)$/java$/com$/sun$/star$/uno$/TypeClass.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/XPropertySet.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/XPropertySetInfo.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/UnknownPropertyException.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/PropertyVetoException.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/XPropertyChangeListener.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/XVetoableChangeListener.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/Property.java \
- $(MISC)$/java$/com$/sun$/star$/beans$/PropertyChangeEvent.java
-
JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/urp.class \
$(CLASSDIR)$/$(PACKAGE)$/Cache.class \
diff --git a/jurt/com/sun/star/uno/makefile.mk b/jurt/com/sun/star/uno/makefile.mk
index d1f7879d159d..02258580ac9e 100644
--- a/jurt/com/sun/star/uno/makefile.mk
+++ b/jurt/com/sun/star/uno/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 15:27:54 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:06:52 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,27 +71,16 @@ TARGET = com_sun_star_uno
# --- Files --------------------------------------------------------
-GENJAVAFILES = \
- $(MISC)$/java$/$(PACKAGE)$/Exception.java \
- $(MISC)$/java$/$(PACKAGE)$/RuntimeException.java \
- $(MISC)$/java$/$(PACKAGE)$/TypeClass.java \
- $(MISC)$/java$/$(PACKAGE)$/Uik.java \
- $(MISC)$/java$/$(PACKAGE)$/XInterface.java
-
JAVACLASSFILES= \
- $(CLASSDIR)$/$(PACKAGE)$/Any.class \
$(CLASSDIR)$/$(PACKAGE)$/Ascii.class \
$(CLASSDIR)$/$(PACKAGE)$/AsciiString.class \
$(CLASSDIR)$/$(PACKAGE)$/BridgeTurner.class \
- $(CLASSDIR)$/$(PACKAGE)$/Enum.class \
$(CLASSDIR)$/$(PACKAGE)$/IBridge.class \
$(CLASSDIR)$/$(PACKAGE)$/IEnvironment.class \
$(CLASSDIR)$/$(PACKAGE)$/IQueryInterface.class \
$(CLASSDIR)$/$(PACKAGE)$/Mapping.class \
$(CLASSDIR)$/$(PACKAGE)$/MappingException.class \
$(CLASSDIR)$/$(PACKAGE)$/MappingWrapper.class \
- $(CLASSDIR)$/$(PACKAGE)$/Type.class \
- $(CLASSDIR)$/$(PACKAGE)$/Union.class \
$(CLASSDIR)$/$(PACKAGE)$/UnoRuntime.class
# --- Targets ------------------------------------------------------
diff --git a/jurt/util/makefile.pmk b/jurt/util/makefile.pmk
index cd77efec41cf..861c2e5a186b 100644
--- a/jurt/util/makefile.pmk
+++ b/jurt/util/makefile.pmk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.pmk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hr $ $Date: 2000-09-18 15:27:56 $
+# last change: $Author: jsc $ $Date: 2000-11-08 13:08:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -64,14 +64,5 @@
.INCLUDE : settings.mk
-JARFILES = sandbox.jar
-CLASSGENDIR = $(OUT)$/classgen
-#classpath if jarfiles not set
-XCLASSPATH := $(XCLASSPATH)$(PATH_SEPERATOR)$(MISC)$/java
-#XCLASSPATH = $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSGENDIR)
-RDB = $(SOLARBINDIR)$/applicat.rdb
+JARFILES = sandbox.jar ridl.jar
JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-
-%.java:
- javamaker -BUCR -O$(OUT)$/misc$/java $(subst,$/,. $(subst,$(OUT)$/misc$/java$/,-T $*)) $(RDB)