diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
| commit | 23dd856d3c70a63dd47ae2a09a75833267296432 (patch) | |
| tree | 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /RepositoryExternal.mk | |
| parent | 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff) | |
| parent | 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff) | |
Merge branch 'feature/gbuild_extensions'
Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ac2a95bd298d..e986ac3528b8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -905,6 +905,28 @@ endef endif # SYSTEM_CURL +ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) + +define gb_LinkTarget__use_mozilla_headers +$(eval $(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MOZILLA_HEADERS_CFLAGS) +)) +endef + +else #!SYSTEM_MOZILLA_HEADERS + +define gb_LinkTarget__use_mozilla_headers +$(eval $(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/npsdk \ +)) +endef + +endif #SYSTEM_MOZILLA_HEADERS +#TODO np_sdk $(eval $(call gb_LinkTarget_add_external_headers,$(1),np_sdk)) + + # MacOSX-only frameworks ############################################ # (in alphabetical order) |