tweak makefiles after np_sdk is in tail_build

Also change <npsdk/npapi.h> to "npapi.h"

RepositoryExternal.mk

@@ -924,7 +924,6 @@ $(eval $(call gb_LinkTarget_set_include,$(1),\
 endef
 
 endif #SYSTEM_MOZILLA_HEADERS
-#TODO np_sdk $(eval $(call gb_LinkTarget_add_external_headers,$(1),np_sdk))
 
 
 # MacOSX-only frameworks ############################################

extensions/Executable_pluginapp.bin.mk

@@ -30,6 +30,10 @@
 
 $(eval $(call gb_Executable_Executable,pluginapp.bin))
 
+$(eval $(call gb_Executable_add_external_headers,pluginapp.bin,np_sdk_inc))
+
+$(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers))
+
 $(eval $(call gb_Executable_set_include,pluginapp.bin,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/extensions/source/plugin/inc \

extensions/Library_npsoplugin.mk

@@ -32,12 +32,12 @@ $(eval $(call gb_Library_Library,npsoplugin))
 
 $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers))
 
-ifeq ($(GUI),UNX)
-
-$(eval $(call gb_Library_add_ldflags,npsoplugin,\
-	$(OUTDIR)/lib/npunix.o \
+$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
+	nputils \
 ))
 
+ifeq ($(GUI),UNX)
+
 $(eval $(call gb_Library_add_libs,npsoplugin,\
 	-ldl \
 ))
@@ -58,10 +58,6 @@ endif # GUI=UNX
 
 ifeq ($(GUI),WNT)
 
-$(eval $(call gb_Library_add_ldflags,npsoplugin,\
-	$(OUTDIR)/lib/npwin.obj \
-))
-
 $(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
 	ooopathutils \
 ))

extensions/Library_pl.mk

@@ -32,10 +32,13 @@ $(eval $(call gb_Library_Library,pl))
 
 $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
 
+$(eval $(call gb_Library_add_external_headers,pl,np_sdk_inc))
+
+$(eval $(call gb_Library_use_external,pl,mozilla_headers))
+
 $(eval $(call gb_Library_set_include,pl,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/extensions/source/plugin/inc \
-	-I$(OUTDIR)/inc/mozilla/plugin \
 ))
 
 $(eval $(call gb_Library_add_api,pl,\
@@ -43,25 +46,11 @@ $(eval $(call gb_Library_add_api,pl,\
 	udkapi \
 ))
 
-ifneq ($(SOLAR_JAVA),)
-
-$(eval $(call gb_Library_set_include,pl,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/mozilla/java \
-	-I$(OUTDIR)/mozilla/nspr \
-))
-
+ifeq ($(SOLAR_JAVA),TRUE)
 $(eval $(call gb_Library_add_defs,pl,\
 	-DOJI \
 ))
 
-ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_include,pl,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/npsdk \
-))
-endif # GUIBASE=aqua
-
 endif # SOLAR_JAVA=YES
 
 ifeq ($(SYSTEM_MOZILLA),YES)

extensions/source/nsplugin/source/npshell.cxx

@@ -69,7 +69,7 @@
 #include "boost/scoped_array.hpp"
 #include "tools/pathutils.hxx"
 
-#include <npsdk/npapi.h>
+#include "npapi.h"
 #include "npshell.hxx"
 #include "so_env.hxx"
 #include "so_msg.hxx"

extensions/source/plugin/inc/plugin/aqua/sysplug.hxx

@@ -40,7 +40,7 @@
 #undef uint32
 
 #define XP_MAC
-#include "npsdk/npapi.h"
+#include "npapi.h"
 #include "npsdk/npupp.h"
 
 #include "plugin/plcom.hxx"

extensions/source/plugin/inc/plugin/unx/plugcon.hxx

@@ -77,7 +77,7 @@ extern "C" {
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npsdk/npapi.h>
+#include "npapi.h"
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define

extensions/source/plugin/inc/plugin/win/sysplug.hxx

@@ -35,7 +35,7 @@
 #include <tchar.h>
 
 #pragma pack( push, 8 )
-#include <npsdk/npapi.h>
+#include "npapi.h"
 #include <npsdk/npupp.h>
 #pragma pack( pop )
 

solenv/gbuild/Library.mk

@@ -176,6 +176,7 @@ $(eval $(foreach method,\
 	add_linked_static_libs \
 	use_external \
 	use_externals \
+	add_external_headers \
 	add_package_headers \
 	add_sdi_headers \
 	export_objects_list \