diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 6 | ||||
-rw-r--r-- | extensions/Library_pl.mk | 6 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 1 | ||||
-rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 75 |
5 files changed, 85 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 45e2e4263224..491f5dc364bc 100644 --- a/Repository.mk +++ b/Repository.mk @@ -523,6 +523,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ libeay32 \ nputils \ pdfimport_s \ + plugcon \ ssleay32 \ ooopathutils \ sample \ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 2b046a333028..52081072f4e1 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -47,8 +47,10 @@ $(eval $(call gb_Executable_add_api,pluginapp.bin,\ $(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\ extensions/source/plugin/unx/npwrap \ extensions/source/plugin/unx/npnapi \ - extensions/source/plugin/unx/mediator \ - extensions/source/plugin/unx/plugcon \ +)) + +$(eval $(call gb_Executable_add_linked_static_libs,pluginapp.bin,\ + plugcon \ )) $(eval $(call gb_Executable_add_linked_libs,pluginapp.bin,\ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 9a9dbdef9620..5ec260bbcfec 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -104,13 +104,15 @@ $(eval $(call gb_Library_use_external,pl,gtk)) endif # ENABLE_GTK=TRUE $(eval $(call gb_Library_add_exception_objects,pl,\ - extensions/source/plugin/unx/mediator \ extensions/source/plugin/unx/nppapi \ - extensions/source/plugin/unx/plugcon \ extensions/source/plugin/unx/sysplug \ extensions/source/plugin/unx/unxmgr \ )) +$(eval $(call gb_Library_add_linked_static_libs,pl,\ + plugcon \ +)) + $(eval $(call gb_Library_add_libs,pl,\ -lX11 \ )) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 4e1b027fc933..497f074fd37c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -109,6 +109,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ ifeq ($(GUI),UNX) ifneq ($(GUIBASE),aqua) $(eval $(call gb_Module_add_targets,extensions,\ + StaticLibrary_plugcon \ Executable_pluginapp.bin \ )) endif diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk new file mode 100644 index 000000000000..1d268180bd37 --- /dev/null +++ b/extensions/StaticLibrary_plugcon.mk @@ -0,0 +1,75 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# [ Copyright (C) 2012 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ] +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +ifneq ($(GUI),UNX) +$(error only for UNX) +endif + +$(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) + +$(eval $(call gb_StaticLibrary_add_external_headers,plugcon,np_sdk_inc)) + +$(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) + +$(eval $(call gb_StaticLibrary_set_include,plugcon,\ + $$(INCLUDE) \ + -I$(SRCDIR)/extensions/source/plugin/inc \ +)) + +$(eval $(call gb_StaticLibrary_add_api,plugcon,\ + offapi \ + udkapi \ +)) + +ifeq ($(SOLAR_JAVA),TRUE) +$(eval $(call gb_StaticLibrary_add_defs,plugcon,\ + -DOJI \ +)) + +endif # SOLAR_JAVA=YES + +ifeq ($(SYSTEM_MOZILLA),YES) +$(eval $(call gb_StaticLibrary_add_defs,plugcon,\ + -DSYSTEM_MOZILLA \ +)) +endif # SYSTEM_MOZILLA=YES + +ifeq ($(ENABLE_GTK),TRUE) +$(eval $(call gb_StaticLibrary_add_defs,plugcon,\ + -DENABLE_GTK \ +)) + +$(eval $(call gb_StaticLibrary_use_external,plugcon,gtk)) +endif # ENABLE_GTK=TRUE + +$(eval $(call gb_StaticLibrary_add_exception_objects,plugcon,\ + extensions/source/plugin/unx/mediator \ + extensions/source/plugin/unx/plugcon \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: + |