summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-02 22:53:21 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2008-12-04 06:06:27 (GMT)
commitcbb9ee57f8f29d2a1c39946381471fcd3b8e495e (patch) (side-by-side diff)
treed84094dc9890e34d150332ff71c58d81dd17e29d
parentb268458eab2f213ec14dfe8013aa714c187e3aab (diff)
downloadxserver-cbb9ee57f8f29d2a1c39946381471fcd3b8e495e.zip
xserver-cbb9ee57f8f29d2a1c39946381471fcd3b8e495e.tar.gz
XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac3
-rw-r--r--hw/xquartz/mach-startup/Makefile.am2
-rw-r--r--hw/xquartz/pbproxy/Makefile.am4
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 947a167..ae96c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1532,8 +1532,7 @@ if test "x$XQUARTZ" = xyes; then
CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
- PKG_CHECK_MODULES(APPLEWMPROTO, [applewmproto >= 1.1.1])
- PKG_CHECK_MODULES(APPLEWM, [applewm >= 1.0.0])
+ PKG_CHECK_MODULES(XPBPROXY, [applewmproto >= 1.1.1] [applewm >= 1.0.0] xfixes fixesproto)
if test "x$STANDALONE_XPBPROXY" = xyes ; then
AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 65ee2fa..b4e7852 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -19,7 +19,7 @@ X11_LDADD = \
$(top_builddir)/dix/dixfonts.lo \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
- $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
+ $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
X11_LDFLAGS = \
-XCClinker -Objc \
diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
index 65e5e4a..e1c537f 100644
--- a/hw/xquartz/pbproxy/Makefile.am
+++ b/hw/xquartz/pbproxy/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-AM_LDFLAGS=-L/usr/X11/lib -lX11 -lXfixes -lAppleWM -framework AppKit -framework Foundation -framework ApplicationServices
+AM_CFLAGS=$(XPBPROXY_CFLAGS)
noinst_LTLIBRARIES = libxpbproxy.la
libxpbproxy_la_SOURCES = \
@@ -8,6 +8,8 @@ libxpbproxy_la_SOURCES = \
x-input.m \
x-selection.m
+libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)
+
if STANDALONE_XPBPROXY
bin_PROGRAMS = xpbproxy