summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-01-15 12:31:41 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-01-15 12:31:41 +0000
commitde1d0de2f1ecea306e584e1b356ae1a913f2df40 (patch)
tree0217607e9367e68e808e5511380e99e20b18566a /connectivity
parent307bf200fa2262b0e235c12601ede4143eeb96fd (diff)
INTEGRATION: CWS dba22b (1.9.4); FILE MERGED
2007/01/03 09:38:53 fs 1.9.4.2: RESYNC: (1.9-1.11); FILE MERGED 2006/12/19 12:09:01 fs 1.9.4.1: #i72751# proper packaging
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk17
1 files changed, 5 insertions, 12 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index 29ba8f39124c..b1768b4bc23b 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: rt $ $Date: 2006-12-22 10:40:58 $
+# last change: $Author: vg $ $Date: 2007-01-15 13:31:41 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -52,24 +52,17 @@ XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
JARFILES+= hsqldb.jar
.ENDIF
-PRIMARY_JAVAFILES =\
+JAVAFILES =\
NativeInputStreamHelper.java\
NativeOutputStreamHelper.java\
NativeStorageAccess.java\
StorageAccess.java\
StorageFileAccess.java\
StorageNativeInputStream.java\
- StorageNativeOutputStream.java
-
-SECONDARY_JAVAFILES =\
+ StorageNativeOutputStream.java\
FileSystemRuntimeException.java
-
-JAVAFILES =\
- $(PRIMARY_JAVAFILES)\
- $(SECONDARY_JAVAFILES)
-JAVACLASSFILES = $(foreach,i,$(PRIMARY_JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-JAVACLASSFILES += $(foreach,i,$(SECONDARY_JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
JARCOMPRESS = TRUE
JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)