summaryrefslogtreecommitdiff
path: root/hw/xquartz/Makefile.am
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-06 00:06:19 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-06 02:49:48 -0700
commit7295e544332b0fa929f651304f9d4aca3db4a33e (patch)
treea8c76487d1a4d8aae13ac3cf9a4db003b49f28d7 /hw/xquartz/Makefile.am
parentd41d677ab4118e73140ea2392e0d48eb361af1cf (diff)
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
Diffstat (limited to 'hw/xquartz/Makefile.am')
-rw-r--r--hw/xquartz/Makefile.am8
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index b2674be4f..bbd21f816 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -9,16 +9,12 @@ AM_CPPFLAGS = \
-DXFree86Server \
-I$(top_srcdir)/miext/rootless
-if X11APP
-X11APP_SUBDIRS = bundle
-endif
-
-SUBDIRS = . GL xpr $(X11APP_SUBDIRS)
-DIST_SUBDIRS = GL xpr bundle
+SUBDIRS = bundle . GL xpr stub
libXquartz_la_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \
$(top_srcdir)/mi/miinitext.c \
+ bundle/bundle-main.c \
X11Application.m \
X11Controller.m \
applewm.c \