XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c
)
This commit is contained in:
parent
28ac79450c
commit
315f089056
|
@ -2164,7 +2164,8 @@ hw/xwin/Makefile
|
|||
hw/xquartz/Makefile
|
||||
hw/xquartz/GL/Makefile
|
||||
hw/xquartz/bundle/Makefile
|
||||
hw/xquartz/stub/Makefile
|
||||
hw/xquartz/doc/Makefile
|
||||
hw/xquartz/mach-startup/Makefile
|
||||
hw/xquartz/xpr/Makefile
|
||||
hw/kdrive/Makefile
|
||||
hw/kdrive/ati/Makefile
|
||||
|
|
|
@ -9,12 +9,11 @@ AM_CPPFLAGS = \
|
|||
-DXFree86Server \
|
||||
-I$(top_srcdir)/miext/rootless
|
||||
|
||||
SUBDIRS = bundle . GL xpr stub
|
||||
SUBDIRS = bundle . GL xpr mach-startup doc
|
||||
|
||||
libXquartz_la_SOURCES = \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
bundle/bundle-main.c \
|
||||
X11Application.m \
|
||||
X11Controller.m \
|
||||
applewm.c \
|
||||
|
|
|
@ -7,7 +7,6 @@ resource_DATA = Xquartz.plist
|
|||
EXTRA_DIST = \
|
||||
mk_bundke.sh \
|
||||
$(resource_DATA) \
|
||||
bundle-main.c \
|
||||
Resources/da.lproj/InfoPlist.strings \
|
||||
Resources/da.lproj/Localizable.strings \
|
||||
Resources/da.lproj/main.nib/keyedobjects.nib \
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
appmandir = $(APP_MAN_DIR)
|
||||
appman_PRE = Xquartz.man.pre
|
||||
appman_PROCESSED = $(appman_PRE:man.pre=man)
|
||||
appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
|
||||
|
||||
CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
|
||||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
cp $< $@
|
||||
|
||||
EXTRA_DIST = \
|
||||
Xquartz.man.pre
|
|
@ -0,0 +1,34 @@
|
|||
AM_CPPFLAGS = \
|
||||
-DBUILD_DATE=\"$(BUILD_DATE)\" \
|
||||
-DXSERVER_VERSION=\"$(VERSION)\"
|
||||
|
||||
x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS
|
||||
x11app_PROGRAMS = X11
|
||||
|
||||
X11_SOURCES = \
|
||||
bundle-main.c
|
||||
|
||||
X11_LDADD = \
|
||||
$(top_builddir)/hw/xquartz/libXquartz.la \
|
||||
$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
|
||||
$(top_builddir)/dix/dixfonts.lo \
|
||||
$(top_builddir)/miext/rootless/librootless.la \
|
||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
|
||||
|
||||
X11_LDFLAGS = \
|
||||
-XCClinker -Objc \
|
||||
-Wl,-u,_miDCInitialize \
|
||||
-Wl,-framework,Carbon \
|
||||
-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
|
||||
-Wl,-framework,OpenGL \
|
||||
-Wl,-framework,Cocoa \
|
||||
-Wl,-framework,CoreAudio \
|
||||
-Wl,-framework,IOKit
|
||||
|
||||
bin_PROGRAMS = Xquartz
|
||||
|
||||
Xquartz_SOURCES = \
|
||||
stub.c
|
||||
|
||||
Xquartz_LDFLAGS = \
|
||||
-Wl,-framework,CoreServices
|
|
@ -1,11 +0,0 @@
|
|||
AM_CPPFLAGS = \
|
||||
-DBUILD_DATE=\"$(BUILD_DATE)\" \
|
||||
-DXSERVER_VERSION=\"$(VERSION)\"
|
||||
|
||||
bin_PROGRAMS = Xquartz
|
||||
|
||||
Xquartz_SOURCES = \
|
||||
stub.c
|
||||
|
||||
Xquartz_LDFLAGS = \
|
||||
-framework CoreServices
|
|
@ -1,5 +1,4 @@
|
|||
x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS
|
||||
x11app_PROGRAMS = X11
|
||||
noinst_LTLIBRARIES = libXquartzXpr.la
|
||||
|
||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||
AM_CPPFLAGS = \
|
||||
|
@ -7,7 +6,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/miext \
|
||||
-I$(top_srcdir)/miext/rootless
|
||||
|
||||
X11_SOURCES = \
|
||||
libXquartzXpr_la_SOURCES = \
|
||||
appledri.c \
|
||||
dri.c \
|
||||
xprAppleWM.c \
|
||||
|
@ -19,36 +18,7 @@ X11_SOURCES = \
|
|||
x-hook.c \
|
||||
x-list.c
|
||||
|
||||
X11_LDADD = \
|
||||
$(top_builddir)/hw/xquartz/libXquartz.la \
|
||||
$(top_builddir)/dix/dixfonts.lo \
|
||||
$(top_builddir)/miext/rootless/librootless.la \
|
||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
|
||||
|
||||
X11_LDFLAGS = \
|
||||
-XCClinker -Objc \
|
||||
-Wl,-u,_miDCInitialize \
|
||||
-Wl,-framework,Carbon \
|
||||
-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
|
||||
-Wl,-framework,OpenGL \
|
||||
-Wl,-framework,Cocoa \
|
||||
-Wl,-framework,CoreAudio \
|
||||
-Wl,-framework,IOKit
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_PRE = Xquartz.man.pre
|
||||
appman_PROCESSED = $(appman_PRE:man.pre=man)
|
||||
appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
|
||||
|
||||
CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
|
||||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
cp $< $@
|
||||
|
||||
EXTRA_DIST = \
|
||||
Xquartz.man.pre \
|
||||
dri.h \
|
||||
dristruct.h \
|
||||
appledri.h \
|
||||
|
|
Loading…
Reference in New Issue