RepositoryExternal.mk | 23 ++++++++++++++++++++---
connectivity/Library_mozabdrv.mk | 20 --------------------
languagetool/Module_languagetool.mk | 2 +-
3 files changed, 21 insertions(+), 24 deletions(-)
New commits:
commit 495cd12da44f3efc9626aa68a5c06653c2049b26
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Oct 31 11:07:58 2013 +0100
languagetool: argh... added the wrong file
Change-Id: I817067f0f56dca6b2b086b73c97eeaea266fb363
diff --git a/languagetool/Module_languagetool.mk
b/languagetool/Module_languagetool.mk
index 565a14c..0574d55 100644
--- a/languagetool/Module_languagetool.mk
+++ b/languagetool/Module_languagetool.mk
@@ -13,7 +13,7 @@ ifneq ($(ENABLE_JAVA),)
ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,languagetool,\
ExternalProject_languagetool \
- ExtensionPackage_languagetool \
+ ExtensionPackage_LanguageTool \
UnpackedTarball_languagetool \
))
endif
commit bf80dfc0615f6179a9dcf0fc1fbca5a72ad7bfba
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Oct 31 11:00:47 2013 +0100
clean up mozilla external
Change-Id: Ic69b8763da2933159b55a243c7aed4a8ce557183
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index efc9542..f0138aa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2306,21 +2306,38 @@ endef
endif # SYSTEM_POSTGRESQL
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
define gb_LinkTarget__use_mozilla
+$(call gb_LinkTarget_use_unpacked,$(1),moz_lib)
+$(call gb_LinkTarget_use_unpacked,$(1),moz_inc)
+
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_INTERNAL_API \
)
$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc) \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/addrbook \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/content \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/embed_base \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/intl \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mime \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mozldap \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/msgbase \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/necko \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/pref \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/profile \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/rdf \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/string \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/uconv \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom \
+ -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom_obsolete \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/mozilla \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \
-)
-$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \
$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \
)
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 97cde49..ae0ef14 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -12,32 +12,12 @@ $(eval $(call gb_Library_Library,mozabdrv))
$(eval $(call gb_Library_set_include,mozabdrv,\
-I$(SRCDIR)/connectivity/source/drivers/mozab \
-I$(SRCDIR)/connectivity/source/inc \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc) \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/addrbook \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/content \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/embed_base \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/intl \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mime \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/mozldap \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/msgbase \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/necko \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/pref \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/profile \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/rdf \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/string \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/uconv \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom \
- -I$(call gb_UnpackedTarball_get_dir,moz_inc)/xpcom_obsolete \
$$(INCLUDE) \
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
$(eval $(call gb_Library_use_sdk_api,mozabdrv))
-$(eval $(call gb_Library_use_package,mozabdrv,moz_lib))
-
-$(eval $(call gb_Library_use_unpacked,mozabdrv,moz_inc))
-
$(eval $(call gb_Library_use_libraries,mozabdrv,\
comphelper \
cppu \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
