diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:11:15 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:11:15 +0000 |
| commit | 1c5ee59a3bf7a5ef7652151e0529c29766388ed1 (patch) | |
| tree | 4b596407136ef7daa200cedbe3d3fa62e98a5a5e /connectivity | |
| parent | fe822bfab51453049e8a59af46678d32ad81455d (diff) | |
INTEGRATION: CWS revivehsqldb (1.9.8); FILE MERGED
2006/12/19 12:03:20 fs 1.9.8.1: #i72751# proper packaging
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk index ed19608a0cca..c00811080695 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.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2006-12-12 15:50:40 $ +# last change: $Author: ihi $ $Date: 2006-12-21 12:11:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,6 +37,8 @@ PRJNAME = connectivity PACKAGE = com$/sun$/star$/sdbcx$/comp$/hsqldb TARGET = sdbc_hsqldb +SECONDARY_PACKAGE = org$/hsqldb$/lib + # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -49,20 +51,28 @@ XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) .ELSE JARFILES+= hsqldb.jar .ENDIF -JAVAFILES =\ + +PRIMARY_JAVAFILES =\ NativeInputStreamHelper.java\ NativeOutputStreamHelper.java\ NativeStorageAccess.java\ StorageAccess.java\ StorageFileAccess.java\ StorageNativeInputStream.java\ - StorageNativeOutputStream.java\ + StorageNativeOutputStream.java + +SECONDARY_JAVAFILES =\ FileSystemRuntimeException.java + +JAVAFILES =\ + $(PRIMARY_JAVAFILES)\ + $(SECONDARY_JAVAFILES) -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVACLASSFILES = $(foreach,i,$(PRIMARY_JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVACLASSFILES += $(foreach,i,$(SECONDARY_JAVAFILES) $(CLASSDIR)$/$(SECONDARY_PACKAGE)$/$(i:b).class) JARCOMPRESS = TRUE -JARCLASSDIRS = $(PACKAGE) +JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARTARGET = $(TARGET).jar # --- Targets ------------------------------------------------------ |