diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 20:58:22 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 20:58:22 +0100 |
| commit | 4ee82ce8aeb36673301b631e94f80f725eecc362 (patch) | |
| tree | 15bdae39b04e3db85ff6fa715377b57a4a3aa41a | |
| parent | a705718a7d95c8e1abc22fcc57ddb84e5b18aa0a (diff) | |
extensions: nsplugin: tweak linked libraries
| -rw-r--r-- | extensions/Executable_nsplugin.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 6b97d46e470e..49b8761aacea 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -1,4 +1,4 @@ -# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -46,21 +46,15 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\ cppu \ cppuhelper \ sal \ + $(if $(filter $(GUI),UNX), \ + dl \ + ) \ + $(if $(filter $(OS),SOLARIS), \ + nsl \ + socket \ + ) \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ - dl \ -)) -endif - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_add_libs,nsplugin,\ - -lsocket \ - -lnsl \ -)) -endif - ifeq ($(GUI),WNT) $(eval $(call gb_Executable_add_ldflags,nsplugin,\ $(OUTDIR)/lib/pathutils-obj.obj \ @@ -85,4 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\ )) endif # WNT -# vim:set shiftwidth=4 softtabstop=4 expandtab: +# vim: set noet sw=4 ts=4: |