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

14 files changed, 3 insertions, 49 deletions

diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index b698e03e85c8..5d82712d0d8a 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/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 \
diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk
deleted file mode 100644
index 9f4d857fdf9b..000000000000
--- a/np_sdk/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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:
diff --git a/np_sdk/Package_npapi.mk b/np_sdk/Package_npapi.mk
deleted file mode 100644
index 6737a49344c5..000000000000
--- a/np_sdk/Package_npapi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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:
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index b85eaa0ee5d9..3ff331475e2b 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/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
 
diff --git a/np_sdk/mozsrc/LEGAL b/np_sdk/npsdk/LEGAL
index c10e0f0d21a8..c10e0f0d21a8 100644
--- a/np_sdk/mozsrc/LEGAL
+++ b/np_sdk/npsdk/LEGAL
diff --git a/np_sdk/mozsrc/LICENSE b/np_sdk/npsdk/LICENSE
index 18f8109b7972..18f8109b7972 100644
--- a/np_sdk/mozsrc/LICENSE
+++ b/np_sdk/npsdk/LICENSE
diff --git a/np_sdk/mozsrc/README b/np_sdk/npsdk/README
index 9c05653ef6eb..9c05653ef6eb 100644
--- a/np_sdk/mozsrc/README
+++ b/np_sdk/npsdk/README
diff --git a/np_sdk/mozsrc/jri.h b/np_sdk/npsdk/jri.h
index 04e237f2d144..04e237f2d144 100644
--- a/np_sdk/mozsrc/jri.h
+++ b/np_sdk/npsdk/jri.h
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/npsdk/jri_md.h
index ab631d1904a7..ab631d1904a7 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/npsdk/jri_md.h
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/npsdk/jritypes.h
index 03a7a9dcfe41..03a7a9dcfe41 100644
--- a/np_sdk/mozsrc/jritypes.h
+++ b/np_sdk/npsdk/jritypes.h
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/npsdk/npunix.c
index 24ef766873dd..24ef766873dd 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/npsdk/npunix.c
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/npsdk/npupp.h
index e0812ecd9408..e0812ecd9408 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/npsdk/npupp.h
diff --git a/np_sdk/mozsrc/npwin.cxx b/np_sdk/npsdk/npwin.cxx
index 9021c635993c..9021c635993c 100644
--- a/np_sdk/mozsrc/npwin.cxx
+++ b/np_sdk/npsdk/npwin.cxx
diff --git a/np_sdk/mozsrc/plugin.h b/np_sdk/npsdk/plugin.h
index 67e049e4b5f6..ec0dc040538c 100644
--- a/np_sdk/mozsrc/plugin.h
+++ b/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:
 */