Kaydet (Commit) f954c14b authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS sb36 (1.5.50); FILE MERGED

2007/01/22 08:52:26 sb 1.5.50.6: RESYNC: (1.11-1.12); FILE MERGED
2007/01/19 12:25:54 sb 1.5.50.5: #i51803# Cleaned up.
2007/01/12 14:19:48 sb 1.5.50.4: RESYNC: (1.7-1.11); FILE MERGED
2006/11/08 11:08:51 sb 1.5.50.3: RESYNC: (1.6-1.7); FILE MERGED
2005/09/21 07:01:55 sb 1.5.50.2: RESYNC: (1.5-1.6); FILE MERGED
2005/07/14 12:33:04 sb 1.5.50.1: #i51803# Cleaned up dependencies.
üst 4fd53f32
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.12 $ # $Revision: 1.13 $
# #
# last change: $Author: vg $ $Date: 2007-01-15 13:31:41 $ # last change: $Author: obo $ $Date: 2007-03-12 10:40:46 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
...@@ -45,7 +45,7 @@ SECONDARY_PACKAGE = org$/hsqldb$/lib ...@@ -45,7 +45,7 @@ SECONDARY_PACKAGE = org$/hsqldb$/lib
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar JARFILES = jurt.jar unoil.jar
.IF "$(SYSTEM_HSQLDB)" == "YES" .IF "$(SYSTEM_HSQLDB)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
.ELSE .ELSE
...@@ -67,6 +67,7 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class ...@@ -67,6 +67,7 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class
JARCOMPRESS = TRUE JARCOMPRESS = TRUE
JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)
JARTARGET = $(TARGET).jar JARTARGET = $(TARGET).jar
JARCLASSPATH = $(JARFILES)
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment