Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-16 21:50:22+0000 Modified: dba/connectivity/source/drivers/hsqldb/makefile.mk
Log: RESYNC: (1.9-1.13); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/makefile.mk?r1=1.8.172.2&r2=1.8.172.3 Delta lines: +10 -10 --------------------- --- makefile.mk 2006-09-20 08:47:14+0000 1.8.172.2 +++ makefile.mk 2008-01-16 21:50:20+0000 1.8.172.3 @@ -50,6 +50,9 @@ @echo "Not building jurt because Java is disabled" .ENDIF +.IF "$(SYSTEM_HSQLDB)" == "YES" +CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" +.ENDIF # --- Resources --------------------------------- SRS1NAME=$(TARGET) @@ -79,20 +82,17 @@ $(SLO)$/StorageFileAccess.obj \ $(SLO)$/HTables.obj \ $(SLO)$/HTable.obj \ + $(SLO)$/HView.obj \ $(SLO)$/HViews.obj \ $(SLO)$/HCatalog.obj \ $(SLO)$/HColumns.obj \ $(SLO)$/HUser.obj \ $(SLO)$/HUsers.obj \ $(SLO)$/Hservices.obj \ + $(SLO)$/HTools.obj \ $(SLO)$/accesslog.obj - -.IF "$(OS)"=="MACOSX" -#SHL1VERSIONMAP=$(HSQLDB_TARGET).$(DLLPOSTFIX).map -.ELSE SHL1VERSIONMAP=$(HSQLDB_TARGET).map -.ENDIF # --- Library ----------------------------------- @@ -102,13 +102,13 @@ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VOSLIB) \ - $(OSLLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(JVMACCESSLIB) \ $(DBTOOLSLIB) \ $(JVMFWKLIB) \ - $(COMPHELPERLIB) + $(COMPHELPERLIB) \ + $(UNOTOOLSLIB) SHL1DEPN= --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
