Kaydet (Commit) 7970fa51 authored tarafından Richard PALO's avatar Richard PALO Kaydeden (comit) Michael Stahl

cleanup improper SOLARIS linker libs and options

and, most importantly, forget MOTIF!

Change-Id: I0230932618b396ec4d5bf7638a13e5a80a4fada0
Signed-off-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst ee49e52c
...@@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_libraries,pluginapp.bin,\ ...@@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_libraries,pluginapp.bin,\
sal \ sal \
)) ))
ifeq ($(OS),SOLARIS) ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
-lXm \
-lXt \
-lXext \
-lX11 \
-ldl \
))
else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ $(eval $(call gb_Executable_add_libs,pluginapp.bin,\
-lXt \ -lXt \
-lXext \ -lXext \
...@@ -72,13 +64,6 @@ $(eval $(call gb_Executable_use_externals,pluginapp.bin,\ ...@@ -72,13 +64,6 @@ $(eval $(call gb_Executable_use_externals,pluginapp.bin,\
gtk \ 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 endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:
...@@ -35,10 +35,6 @@ ...@@ -35,10 +35,6 @@
#include <vector> #include <vector>
#include <plugin/unx/mediator.hxx> #include <plugin/unx/mediator.hxx>
#if defined SOLARIS
# define USE_MOTIF
#endif
#include <prex.h> #include <prex.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment