User: ihi Date: 2006/12/21 04:11:18 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
Log: INTEGRATION: CWS revivehsqldb (1.9.8); FILE MERGED 2006/12/19 12:03:20 fs 1.9.8.1: #i72751# proper packaging File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.9&r2=1.10 Delta lines: +20 -10 --------------------- --- makefile.mk 12 Dec 2006 15:50:40 -0000 1.9 +++ makefile.mk 21 Dec 2006 12:11:15 -0000 1.10 @@ -37,6 +37,8 @@ PACKAGE = com$/sun$/star$/sdbcx$/comp$/hsqldb TARGET = sdbc_hsqldb +SECONDARY_PACKAGE = org$/hsqldb$/lib + # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -49,20 +51,28 @@ .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 -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +JAVAFILES =\ + $(PRIMARY_JAVAFILES)\ + $(SECONDARY_JAVAFILES) + +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 ------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
