Tag: cws_src680_sb36
User: sb      
Date: 2007/01/12 06:19:50

Modified:
   dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk

Log:
 RESYNC: (1.7-1.11); FILE MERGED

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.5.50.3&r2=1.5.50.4
Delta lines:  +21 -10
---------------------
--- makefile.mk 8 Nov 2006 11:08:51 -0000       1.5.50.3
+++ makefile.mk 12 Jan 2007 14:19:48 -0000      1.5.50.4
@@ -37,6 +37,8 @@
 PACKAGE = com$/sun$/star$/sdbcx$/comp$/hsqldb
 TARGET  = sdbc_hsqldb 
 
+SECONDARY_PACKAGE = org$/hsqldb$/lib
+
 # --- Settings ----------------------------------------------------- 
 .INCLUDE: settings.mk  
 
@@ -49,7 +51,8 @@
 .ELSE
 JARFILES+= hsqldb.jar
 .ENDIF
-JAVAFILES =\
+
+PRIMARY_JAVAFILES =\
        NativeInputStreamHelper.java\
        NativeOutputStreamHelper.java\
        NativeStorageAccess.java\
@@ -58,10 +61,18 @@
        StorageNativeInputStream.java\
        StorageNativeOutputStream.java
        
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) 
$(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+SECONDARY_JAVAFILES =\
+    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)
 
 JARCOMPRESS    = TRUE
-JARCLASSDIRS = $(PACKAGE)
+JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)
 JARTARGET      = $(TARGET).jar
 JARCLASSPATH = $(JARFILES) ..
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to