diff options
| author | Richard PALO <richard@NetBSD.org> | 2014-11-10 17:27:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-11 19:50:13 +0100 |
| commit | 062e19093e3244eea9e0003e344a5400a74ad43c (patch) | |
| tree | cfb6f056aac19b662b75eb8321aa9329b1c75240 /extensions | |
| parent | e1484cbda84eb4450437382f63bacdf020467ef0 (diff) | |
cleanup improper SOLARIS linker libs and options
and, most importantly, forget MOTIF!
Signed-off-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 7970fa513006af45994122a0ec42486e7b32cbe6)
Conflicts:
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
Change-Id: I0230932618b396ec4d5bf7638a13e5a80a4fada0
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 17 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 4 |
2 files changed, 1 insertions, 20 deletions
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index e24390e19c08..96a25cca4c4d 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_libraries,pluginapp.bin,\ sal \ )) -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ - -lXm \ - -lXt \ - -lXext \ - -lX11 \ - -ldl \ -)) -else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) +ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) $(eval $(call gb_Executable_add_libs,pluginapp.bin,\ -lXt \ -lXext \ @@ -72,13 +64,6 @@ $(eval $(call gb_Executable_use_externals,pluginapp.bin,\ gtk \ )) -# the orignal dmakefile said: don't ask, it's ugly -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ - -z nodefs \ -)) -endif - endif # vim:set noet sw=4 ts=4: diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 0d8f787be5e5..6b9acb89a676 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -35,10 +35,6 @@ #include <vector> #include <plugin/unx/mediator.hxx> -#if defined SOLARIS -# define USE_MOTIF -#endif - #define Window XLIB_Window #define Font XLIB_Font #define KeyCode XLIB_KeyCode |