summaryrefslogtreecommitdiff
path: root/hw/xquartz/pbproxy
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-10-03 11:09:26 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-10-03 11:11:47 -0700
commit6020c3fbfe06530cb2b90178d17a7d63beae028a (patch)
tree3ccd0183194eb283337e37f54f20f5e3ef6bea6e /hw/xquartz/pbproxy
parent505c216d030a8eb6e9fa757ecebed9597a850c88 (diff)
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9) (cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
Diffstat (limited to 'hw/xquartz/pbproxy')
-rw-r--r--hw/xquartz/pbproxy/Makefile.am17
1 files changed, 12 insertions, 5 deletions
diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
index f3fcba03c..b316b8741 100644
--- a/hw/xquartz/pbproxy/Makefile.am
+++ b/hw/xquartz/pbproxy/Makefile.am
@@ -1,15 +1,22 @@
AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
AM_LDFLAGS=-L/usr/X11/lib -lX11 -lAppleWM -framework AppKit -framework Foundation -framework ApplicationServices
-noinst_PROGRAMS = pbproxy
-
-pbproxy_SOURCES = \
+SOURCE_FILES = \
trick_autotools.c \
- main.m \
x-input.m \
x-selection.m
+noinst_LTLIBRARIES = libxpbproxy.la
+libxpbproxy_la_SOURCES = $(SOURCE_FILES)
+
+if !INTEGRATED_XPBPROXY
+
+bin_PROGRAMS = xpbproxy
+xpbproxy_SOURCES = main.m
+xpbproxy_LDADD = $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la
+
+endif
+
EXTRA_DIST = \
pbproxy.h \
x-selection.h
-