diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-31 11:00:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 11:00:47 +0100 |
| commit | bf80dfc0615f6179a9dcf0fc1fbca5a72ad7bfba (patch) | |
| tree | abd01874ad8baec7db1a0705ed6d5f1cc7ddff2e /RepositoryExternal.mk | |
| parent | 36033194e3632f4c35333256592a50c497d089f6 (diff) | |
clean up mozilla external
Change-Id: Ic69b8763da2933159b55a243c7aed4a8ce557183
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index efc9542decf3..f0138aad95ee 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 \ ) |