fdo#70393: move np_sdk to a subdir of external

Change-Id: Iafba7ff0d0a4b163f9d99195cab36c9968e0bd73
Reviewed-on: https://gerrit.libreoffice.org/6558
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryExternal.mk

@@ -84,7 +84,7 @@ ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
 define gb_LinkTarget__use_npapi_headers
 $(call gb_LinkTarget_set_include,$(1),\
 	$(NPAPI_HEADERS_CFLAGS) \
-	-I$(SRCDIR)/np_sdk \
+	-I$(SRCDIR)/external/np_sdk \
 	$$(INCLUDE) \
 )
 
@@ -94,8 +94,8 @@ else #!SYSTEM_NPAPI_HEADERS
 
 define gb_LinkTarget__use_npapi_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(SRCDIR)/np_sdk/inc \
+	-I$(SRCDIR)/external/np_sdk/inc \
-	-I$(SRCDIR)/np_sdk \
+	-I$(SRCDIR)/external/np_sdk \
 	$$(INCLUDE) \
 )
 

RepositoryModule_host.mk

@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
-	np_sdk \
 	o3tl \
 	$(call gb_Helper_optional,ODK,odk) \
 	offapi \

external/Module_external.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+	np_sdk \
 	$(call gb_Helper_optional,AFMS,afms) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,BOOST,boost) \

external/np_sdk/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

external/np_sdk/StaticLibrary_nputils.mk

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

external/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/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
+   NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
    defined in extensions/source/nsplugin/source/npshell.cxx:
 */