use ENABLE_NSPLUGIN again

extensions/Module_extensions.mk

@@ -76,36 +76,27 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifneq ($(WITH_MOZILLA),NO)
-
+ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-	Library_pl \
 	Executable_nsplugin \
+	Library_npsoplugin \
+	WinResTarget_npsoplugin \
 ))
 
-ifeq ($(GUI),WNT)
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-	Library_npsoplugin \
-	WinResTarget_npsoplugin \
+	Library_pl \
 ))
-endif # GUI=WNT
 
 ifeq ($(GUI),UNX)
-
 ifneq ($(GUIBASE),aqua)
-
 $(eval $(call gb_Module_add_targets,extensions,\
 	Executable_pluginapp.bin \
 ))
 
 endif # GUIBASE!=aqua
-
-ifneq ($(ENABLE_GTK),)
-$(eval $(call gb_Module_add_targets,extensions,\
-	Library_npsoplugin \
-))
-endif # ENABLE_GTK
-
 endif # GUI=UNX
 
 endif # WITH_MOZILLA=YES

np_sdk/Module_np_sdk.mk

@@ -27,9 +27,12 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	Package_inc \
+))
+
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,np_sdk,\
 	StaticLibrary_nputils \
 ))