From 13ef9dcc206d30ebd4d63afb186d379dc849b36c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 15 Nov 2012 18:09:55 +0100
Subject: Rename "Mozilla headers" to "NPAPI headers" (incl. configure option
 name)

...to avoid confusion what that is actually about.  (Especially, it is
completely unrelated to --enable-mozilla.)

ATTENTION:  This renames the configure option --with-system-mozilla-headers to
--with-system-npapi-headers.

Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc
---
 np_sdk/Module_np_sdk.mk         |  4 ++--
 np_sdk/Package_mozilla_inc.mk   | 35 -----------------------------------
 np_sdk/Package_npapi.mk         | 35 +++++++++++++++++++++++++++++++++++
 np_sdk/StaticLibrary_nputils.mk |  2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 np_sdk/Package_mozilla_inc.mk
 create mode 100644 np_sdk/Package_npapi.mk

(limited to 'np_sdk')

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_mozilla_inc.mk
deleted file mode 100644
index 20b94f13de03..000000000000
--- a/np_sdk/Package_mozilla_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# 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_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))
-
-# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/Package_npapi.mk b/np_sdk/Package_npapi.mk
new file mode 100644
index 000000000000..5cf24930992c
--- /dev/null
+++ b/np_sdk/Package_npapi.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,npapi,$(SRCDIR)/np_sdk))
+
+$(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)
-- 
cgit