fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 04:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: pbproxy: Simplify linking

Browse source
This commit is contained in:
Jeremy Huddleston 2008-12-02 14:53:21 -08:00
parent a73d5e5db1
commit 909cc5c4dc
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -1766,8 +1766,7 @@ if test "x$XQUARTZ" = xyes; then
CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -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])

2
hw/xquartz/mach-startup/Makefile.am
View file

@ -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 \

4
hw/xquartz/pbproxy/Makefile.am
View file

@ -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