mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add hsqldb to RepositoryExternal.mk

Browse Source 
Change-Id: I9c038e6fd1c60e4ac77740c55a45439d813524e0
This commit is contained in:
Michael Stahl
2012-08-15 20:24:59 +02:00
parent cdbd6957a5
commit 666173b83c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RepositoryExternal.mk
View File

@@ -1968,6 +1968,20 @@ endif # DESKTOP
### Jars ############################################################ ### Jars ############################################################
ifeq ($(SYSTEM_HSQLDB),YES)
define gb_Jar__use_hsqldb
$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR))
endef
else # !SYSTEM_HSQLDB
define gb_Jar__use_hsqldb
$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/hsqldb.jar)
endef
endif # SYSTEM_HSQLDB
ifeq ($(SYSTEM_SAXON),YES) ifeq ($(SYSTEM_SAXON),YES)
define gb_Jar__use_saxon define gb_Jar__use_saxon

10
connectivity/Jar_sdbc_hsqldb.mk
View File

@@ -27,15 +27,9 @@
$(eval $(call gb_Jar_Jar,sdbc_hsqldb)) $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
ifeq ($(SYSTEM_HSQLDB),YES) $(eval $(call gb_Jar_use_externals,sdbc_hsqldb,\
$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\ hsqldb \
$(HSQLDB_JAR) \
)) ))
else
$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
$(OUTDIR)/bin/hsqldb.jar \
))
endif
# FIXME: is this really necessary? # FIXME: is this really necessary?
$(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\ $(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\