diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:19:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:20:35 +0200 |
commit | d968c28287c8ffbaf6fd6da3a5d872adc8e354b4 (patch) | |
tree | d07ea309ae41546f97383efb46e992cdb0322992 /extensions | |
parent | 496bc3cd6c037360632c33471c4622a095cdcadd (diff) |
fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs
...from previous commit
Change-Id: I945faa6215f971ce817c6450fe0786da0696091f
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/Executable_nsplugin.mk | 69 | ||||
-rw-r--r-- | extensions/Library_npsoplugin.mk | 104 | ||||
-rw-r--r-- | extensions/StaticLibrary_npsoenv.mk | 17 | ||||
-rw-r--r-- | extensions/WinResTarget_npsoplugin.mk | 21 |
4 files changed, 0 insertions, 211 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk deleted file mode 100644 index 1e9ced191caa..000000000000 --- a/extensions/Executable_nsplugin.mk +++ /dev/null @@ -1,69 +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_Executable_Executable,nsplugin)) - -$(eval $(call gb_Executable_use_external,nsplugin,boost_headers)) - -$(eval $(call gb_Executable_use_sdk_api,nsplugin)) - -$(eval $(call gb_Executable_add_exception_objects,nsplugin,\ - extensions/source/nsplugin/source/so_closelistener \ - extensions/source/nsplugin/source/so_instance \ - extensions/source/nsplugin/source/so_main \ -)) - -$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ - npsoenv \ -)) - -$(eval $(call gb_Executable_add_libs,nsplugin,\ - $(if $(filter $(OS),LINUX), \ - -ldl \ - ) \ - $(if $(filter $(OS),SOLARIS), \ - -lnsl \ - -lsocket \ - ) \ -)) - -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_exception_objects,nsplugin,\ - extensions/source/nsplugin/source/nsp_windows \ -)) - -$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ - ooopathutils \ -)) - -$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\ - advapi32 \ - comdlg32 \ - gdi32 \ - kernel32 \ - ole32 \ - oleaut32 \ - shell32 \ - user32 \ - uuid \ - winspool \ - ws2_32 \ -)) -endif # WNT - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk deleted file mode 100644 index 9178a9da1b04..000000000000 --- a/extensions/Library_npsoplugin.mk +++ /dev/null @@ -1,104 +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_Library_Library,npsoplugin)) - -$(eval $(call gb_Library_use_externals,npsoplugin,\ - boost_headers \ - npapi_headers \ -)) - -$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ - npsoenv \ - nputils \ -)) - -ifneq ($(OS),WNT) - -ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Library_add_libs,npsoplugin,\ - -ldl \ -)) -endif - -$(eval $(call gb_Library_use_external,npsoplugin,gtk)) - -$(eval $(call gb_Library_add_defs,npsoplugin,\ - -DMOZ_X11 \ -)) - -ifeq ($(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION),TRUE) -$(eval $(call gb_Library_add_defs,npsoplugin,\ - -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 \ -)) -endif - -ifeq ($(filter-out LINUX FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) -$(eval $(call gb_Library_add_defs,npsoplugin,\ - -DNP_LINUX \ -)) -endif - -else ifeq ($(OS),WNT) - -$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ - ooopathutils \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\ - advapi32 \ - comdlg32 \ - gdi32 \ - kernel32 \ - ole32 \ - oleaut32 \ - shell32 \ - user32 \ - uuid \ - winspool \ - ws2_32 \ -)) - -$(eval $(call gb_Library_add_defs,npsoplugin,\ - -DENGLISH \ -)) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_ldflags,npsoplugin,\ - /EXPORT:NPP_GetMIMEDescription \ - /EXPORT:NPP_Initialize \ - /EXPORT:NPP_Shutdown \ - /EXPORT:NPP_New \ - /EXPORT:NPP_Destroy \ - /EXPORT:NPP_SetWindow \ - /EXPORT:NPP_NewStream \ - /EXPORT:NPP_WriteReady \ - /EXPORT:NPP_Write \ - /EXPORT:NPP_DestroyStream \ - /EXPORT:NPP_StreamAsFile \ - /EXPORT:NPP_URLNotify \ - /EXPORT:NPP_Print \ - /EXPORT:NP_GetEntryPoints \ - /EXPORT:NP_Initialize \ - /EXPORT:NP_Shutdown \ - /EXPORT:NP_GetMIMEDescription \ -)) -endif - -$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) - -endif - -$(eval $(call gb_Library_add_exception_objects,npsoplugin,\ - extensions/source/nsplugin/source/npshell \ -)) - -# vim:set shiftwidth=4 softtabstop=4 noexpandtab: diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk deleted file mode 100644 index 7019ff0172d9..000000000000 --- a/extensions/StaticLibrary_npsoenv.mk +++ /dev/null @@ -1,17 +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_StaticLibrary_StaticLibrary,npsoenv)) - -$(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\ - extensions/source/nsplugin/source/so_env \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk deleted file mode 100644 index 81e442c96603..000000000000 --- a/extensions/WinResTarget_npsoplugin.mk +++ /dev/null @@ -1,21 +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_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) - -$(eval $(call gb_WinResTarget_add_defs,npsoplugin/npsoplugin,\ - -DVERVARIANT=$(LIBO_VERSION_PATCH) \ - -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -)) - -$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) - -# vim:set noet sw=4 ts=4: |