INTEGRATION: CWS vq33 (1.11.12); FILE MERGED

2006/06/25 04:32:15 vq 1.11.12.1: #i66531# Don't include minor.mk.
This commit is contained in:
Oliver Bolte
2006-07-10 18:01:25 +00:00
parent 8a2cee8b79
commit 08b51bdb41

View File

@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.12 $ # $Revision: 1.13 $
# #
# last change: $Author: kz $ $Date: 2006-07-05 21:13:42 $ # last change: $Author: obo $ $Date: 2006-07-10 19:01:25 $
# #
# 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.
@@ -44,13 +44,12 @@ TARGET=so_hsqldb
.INCLUDE : antsettings.mk .INCLUDE : antsettings.mk
.INCLUDE : version.mk .INCLUDE : version.mk
.INCLUDE : minor.mk
.IF "$(SOLAR_JAVA)" != "" .IF "$(SOLAR_JAVA)" != ""
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_ROOTDIR=hsqldb TARFILE_ROOTDIR=hsqldb
CONVERTFILES=build$/build.xml\ CONVERTFILES=build$/build.xml\