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

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) \
 )
 

extensions/Library_npsoplugin.mk

@@ -11,10 +11,6 @@
 
 $(eval $(call gb_Library_Library,npsoplugin))
 
-$(eval $(call gb_Library_use_packages,npsoplugin,\
-	np_sdk_inc \
-))
-
 $(eval $(call gb_Library_use_externals,npsoplugin,\
     boost_headers \
     npapi_headers \

extensions/Library_pl.mk

@@ -13,8 +13,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_externals,pl,\
 	boost_headers \
 	npapi_headers \

extensions/StaticLibrary_plugcon.mk

@@ -14,10 +14,6 @@ endif
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
 
-$(eval $(call gb_StaticLibrary_use_packages,plugcon,\
-    np_sdk_inc \
-))
-
 $(eval $(call gb_StaticLibrary_use_externals,plugcon,\
     boost_headers \
     npapi_headers \

np_sdk/Module_np_sdk.mk

@@ -12,16 +12,6 @@ $(eval $(call gb_Module_Module,np_sdk))
 
 ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER)))
 
-$(eval $(call gb_Module_add_targets,np_sdk,\
-	Package_inc \
-))
-
-ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
-$(eval $(call gb_Module_add_targets,np_sdk,\
-	Package_npapi \
-))
-endif
-
 ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	StaticLibrary_nputils \

np_sdk/Package_inc.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,np_sdk_inc,$(SRCDIR)/np_sdk))
-
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri.h,mozsrc/jri.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/plugin.h,mozsrc/plugin.h))
-
-# vim: set noet sw=4 ts=4:

np_sdk/Package_npapi.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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:

np_sdk/StaticLibrary_nputils.mk

@@ -22,11 +22,11 @@ endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
-	np_sdk/mozsrc/npwin \
+	np_sdk/npsdk/npwin \
 ))
 else
 $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
-	np_sdk/mozsrc/npunix \
+	np_sdk/npsdk/npunix \
 ))
 endif
 

np_sdk/mozsrc/plugin.h → np_sdk/npsdk/plugin.h

@@ -23,7 +23,7 @@
 #include "npapi.h"
 
 /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and
-   NP_Shutdown in np_sdk/mozsrc/ to call NPP_Initialize and NPP_Shutdown, resp.,
+   NP_Shutdown in np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
    defined in extensions/source/nsplugin/source/npshell.cxx:
 */