summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2013-02-25 19:25:31 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2013-02-25 19:32:23 +0100
commitc66e2c4836fa3780c5cabbb511968557121d5cc1 (patch)
tree9f597741671728949539a73bbb9bfd561fba2c42
parentf5305a942bf4c685474c8cd7d5aa6301f5abf75c (diff)
mozabdrv: add dependency to internal mozilla
Change-Id: Id22ba6632f273159838923bf26420d27dd8a89d3
-rw-r--r--connectivity/Library_mozabdrv.mk5
-rw-r--r--moz/ExternalPackage_moz_inc.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index b5b2f3ae5995..bf088bc9794d 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -45,6 +45,11 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_package,mozabdrv,\
+ moz_inc \
+ moz_lib \
+))
+
$(eval $(call gb_Library_use_externals,mozabdrv,\
boost_headers \
mozilla \
diff --git a/moz/ExternalPackage_moz_inc.mk b/moz/ExternalPackage_moz_inc.mk
index dd38f322d68a..fb399a6228c2 100644
--- a/moz/ExternalPackage_moz_inc.mk
+++ b/moz/ExternalPackage_moz_inc.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,moz_inc,moz_inc))
-MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f 2>/dev/null))
+MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f))
$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_inc,inc/mozilla,\
$(MOZ_INC) \