summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-07 00:50:15 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-07 01:41:25 +0200
commit96907bfb02c00d3d3d4085fc4b10d8e0eb0b9f11 (patch)
treec238718005be2105ea799a9c5b258515f74193ce /RepositoryExternal.mk
parent11c72e49522b1af5fe4e2f1871545f8d3ff017d1 (diff)
np_sdk: remove both Package_inc and Package_npapi
This is a bit of a mess, apparently there are some headers here that may come from the system and others that are always internal? Change-Id: Ifbf486d3016bc87849e2593d83b3d48dae3aeca0
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f21a07a696..652e948ad407 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -89,9 +89,12 @@ endif
ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
+# yes this uses internal headers too...
+# they are split across 2 dirs for this reason
define gb_LinkTarget__use_npapi_headers
$(call gb_LinkTarget_set_include,$(1),\
$(NPAPI_HEADERS_CFLAGS) \
+ -I$(SRCDIR)/np_sdk \
$$(INCLUDE) \
)
@@ -100,9 +103,9 @@ endef
else #!SYSTEM_NPAPI_HEADERS
define gb_LinkTarget__use_npapi_headers
-$(call gb_LinkTarget_use_package,$(1),npapi)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(OUTDIR)/inc/external/npsdk \
+ -I$(SRCDIR)/np_sdk/inc \
+ -I$(SRCDIR)/np_sdk \
$$(INCLUDE) \
)