diff options
Diffstat (limited to 'np_sdk')
-rw-r--r-- | np_sdk/Module_np_sdk.mk | 4 | ||||
-rw-r--r-- | np_sdk/Package_npapi.mk (renamed from np_sdk/Package_mozilla_inc.mk) | 10 | ||||
-rw-r--r-- | np_sdk/StaticLibrary_nputils.mk | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index eabc6f8ad3a5..6ebba871eef6 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ )) -ifeq ($(SYSTEM_MOZILLA_HEADERS),NO) +ifeq ($(SYSTEM_NPAPI_HEADERS),NO) $(eval $(call gb_Module_add_targets,np_sdk,\ - Package_mozilla_inc \ + Package_npapi \ )) endif diff --git a/np_sdk/Package_mozilla_inc.mk b/np_sdk/Package_npapi.mk index 20b94f13de03..5cf24930992c 100644 --- a/np_sdk/Package_mozilla_inc.mk +++ b/np_sdk/Package_npapi.mk @@ -25,11 +25,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,mozilla_inc,$(SRCDIR)/np_sdk)) +$(eval $(call gb_Package_Package,npapi,$(SRCDIR)/np_sdk)) -$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npapi.h,inc/npapi.h)) -$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npfunctions.h,inc/npfunctions.h)) -$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/npruntime.h,inc/npruntime.h)) -$(eval $(call gb_Package_add_file,mozilla_inc,inc/external/npsdk/nptypes.h,inc/nptypes.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npapi.h,inc/npapi.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npfunctions.h,inc/npfunctions.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npruntime.h,inc/npruntime.h)) +$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/nptypes.h,inc/nptypes.h)) # vim: set noet sw=4 ts=4: diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index 824c268cea82..d9ff1aef77fd 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,nputils,\ )) $(eval $(call gb_StaticLibrary_use_externals,nputils,\ - mozilla_headers \ + npapi_headers \ )) ifeq ($(GUIBASE),aqua) |