diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-12 17:18:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-12 18:30:34 +0100 |
| commit | d343dddc3fecb46953259ab16892347640383b98 (patch) | |
| tree | 5e7ea66f8c6d24aea2d96e4f79c8dd4cd55b53f5 /extensions | |
| parent | 5926ce12ed9816523f076cba45668f274e86a348 (diff) | |
extensions: split out static library from npsoplugin
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Executable_nsplugin.mk | 5 | ||||
| -rw-r--r-- | extensions/Library_npsoplugin.mk | 2 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 1 | ||||
| -rw-r--r-- | extensions/StaticLibrary_npsoenv.mk | 34 |
4 files changed, 40 insertions, 2 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 383db0005ace..c04e2ed19595 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -38,10 +38,13 @@ $(eval $(call gb_Executable_add_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_env \ extensions/source/nsplugin/source/so_main \ )) +$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ + npsoenv \ +)) + $(eval $(call gb_Executable_add_linked_libs,nsplugin,\ cppu \ cppuhelper \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index a4d3e3b3ea11..08e59c2304e4 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) $(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ + npsoenv \ nputils \ )) @@ -118,7 +119,6 @@ $(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinR endif # GUI=WNT $(eval $(call gb_Library_add_exception_objects,npsoplugin,\ - extensions/source/nsplugin/source/so_env \ extensions/source/nsplugin/source/npshell \ )) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 497f074fd37c..f6a8a22a0f63 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -96,6 +96,7 @@ ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Module_add_targets,extensions,\ Executable_nsplugin \ Library_npsoplugin \ + StaticLibrary_npsoenv \ WinResTarget_npsoplugin \ )) endif diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk new file mode 100644 index 000000000000..3a1abe6dda39 --- /dev/null +++ b/extensions/StaticLibrary_npsoenv.mk @@ -0,0 +1,34 @@ +# -*- 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. + +$(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\ + extensions/source/nsplugin/source/so_env \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: |