diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:53 +0200 |
| commit | 449582407a0aad8096bb2ec75588e6e7d7de0169 (patch) | |
| tree | 1265d24f1eb5ae53ecc44629dad335cf15ab2fec | |
| parent | 4c50f23f87e391d93ded2564000589ef1a70696a (diff) | |
extensions: add np_sdk_inc to mozilla_headers external
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_pl.mk | 2 | ||||
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 2 | ||||
| -rw-r--r-- | np_sdk/StaticLibrary_nputils.mk | 5 |
5 files changed, 1 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d2b14384c9a4..cb8c669b9932 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1034,6 +1034,7 @@ endef else #!SYSTEM_MOZILLA_HEADERS define gb_LinkTarget__use_mozilla_headers +$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc)) $(eval $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/npsdk \ $$(INCLUDE) \ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 4fd84f0f8cc3..57bbb18b2a82 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) -$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) - $(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) $(eval $(call gb_Executable_set_include,pluginapp.bin,\ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index cbcfc795e233..8db7fbacea2c 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_Library,pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) -$(eval $(call gb_Library_use_package,pl,np_sdk_inc)) - $(eval $(call gb_Library_use_external,pl,mozilla_headers)) $(eval $(call gb_Library_set_include,pl,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 0ef41afc3c55..50e90d0ff128 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -31,8 +31,6 @@ endif $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) -$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) - $(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) $(eval $(call gb_StaticLibrary_set_include,plugcon,\ diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index c65b961f6d34..77b1e2db14fc 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -27,8 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) -$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc)) - $(eval $(call gb_StaticLibrary_use_externals,nputils,\ mozilla_headers \ )) @@ -37,19 +35,16 @@ ifeq ($(GUIBASE),aqua) $(eval $(call gb_StaticLibrary_add_defs,nputils,\ -DNO_X11 \ )) - endif ifeq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\ np_sdk/mozsrc/npwin \ )) - else $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\ np_sdk/mozsrc/npunix \ )) - endif # vim: set noet sw=4 ts=4: |