diff options
| -rw-r--r-- | extensions/Module_extensions.mk | 23 | ||||
| -rw-r--r-- | np_sdk/Module_np_sdk.mk | 5 |
2 files changed, 11 insertions, 17 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 9719f2b79305..a94eee6a6322 100644 --- a/extensions/Module_extensions.mk +++ b/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 diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index bda81264c744..6c658d222f52 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/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 \ )) |