Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d6
)
This commit is contained in:
parent
cc98a8e241
commit
8d0efe4c2a
|
@ -2171,8 +2171,8 @@ hw/xgl/glxext/module/Makefile
|
||||||
hw/xnest/Makefile
|
hw/xnest/Makefile
|
||||||
hw/xwin/Makefile
|
hw/xwin/Makefile
|
||||||
hw/darwin/Makefile
|
hw/darwin/Makefile
|
||||||
hw/darwin/apple/Makefile
|
|
||||||
hw/darwin/quartz/Makefile
|
hw/darwin/quartz/Makefile
|
||||||
|
hw/darwin/quartz/apple/Makefile
|
||||||
hw/darwin/quartz/xpr/Makefile
|
hw/darwin/quartz/xpr/Makefile
|
||||||
hw/kdrive/Makefile
|
hw/kdrive/Makefile
|
||||||
hw/kdrive/ati/Makefile
|
hw/kdrive/ati/Makefile
|
||||||
|
|
|
@ -1,21 +1,13 @@
|
||||||
|
noinst_LTLIBRARIES = libXdarwin.la
|
||||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-DINXQUARTZ \
|
-DINXQUARTZ \
|
||||||
-DUSE_NEW_CLUT \
|
-DUSE_NEW_CLUT \
|
||||||
-DXFree86Server \
|
-DXFree86Server
|
||||||
-I$(top_srcdir)/miext/rootless
|
|
||||||
|
|
||||||
if X11APP
|
SUBDIRS = . quartz
|
||||||
X11APP_SUBDIRS = apple
|
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS = quartz $(X11APP_SUBDIRS)
|
libXdarwin_la_SOURCES = \
|
||||||
DIST_SUBDIRS = quartz apple
|
|
||||||
|
|
||||||
bin_PROGRAMS = Xquartz
|
|
||||||
man1_MANS = Xquartz.man
|
|
||||||
|
|
||||||
Xquartz_SOURCES = \
|
|
||||||
darwin.c \
|
darwin.c \
|
||||||
darwinEvents.c \
|
darwinEvents.c \
|
||||||
darwinKeyboard.c \
|
darwinKeyboard.c \
|
||||||
|
@ -23,49 +15,7 @@ Xquartz_SOURCES = \
|
||||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||||
$(top_srcdir)/mi/miinitext.c
|
$(top_srcdir)/mi/miinitext.c
|
||||||
|
|
||||||
# We should probably add these once they're working, or are these obsolete and to be removed?
|
|
||||||
# ./quartz/cr/libcr.a
|
|
||||||
# ./quartz/fullscreen/libfullscreen.a
|
|
||||||
|
|
||||||
Xquartz_LDADD = \
|
|
||||||
./quartz/libXquartz.a \
|
|
||||||
./quartz/xpr/libxpr.a \
|
|
||||||
$(top_builddir)/dix/dixfonts.lo \
|
|
||||||
$(top_builddir)/dix/libdix.la \
|
|
||||||
$(top_builddir)/os/libos.la \
|
|
||||||
$(top_builddir)/dix/libxpstubs.la \
|
|
||||||
$(top_builddir)/miext/shadow/libshadow.la \
|
|
||||||
$(top_builddir)/fb/libfb.la \
|
|
||||||
$(top_builddir)/mi/libmi.la \
|
|
||||||
$(top_builddir)/composite/libcomposite.la \
|
|
||||||
$(top_builddir)/damageext/libdamageext.la \
|
|
||||||
$(top_builddir)/miext/damage/libdamage.la \
|
|
||||||
$(top_builddir)/xfixes/libxfixes.la \
|
|
||||||
$(top_builddir)/miext/cw/libcw.la \
|
|
||||||
$(top_builddir)/Xext/libXext.la \
|
|
||||||
$(top_builddir)/xkb/libxkb.la \
|
|
||||||
$(top_builddir)/xkb/libxkbstubs.la \
|
|
||||||
$(top_builddir)/Xi/libXi.la \
|
|
||||||
$(top_builddir)/dbe/libdbe.la \
|
|
||||||
$(top_builddir)/record/librecord.la \
|
|
||||||
$(top_builddir)/XTrap/libxtrap.la \
|
|
||||||
$(top_builddir)/miext/rootless/librootless.la \
|
|
||||||
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
|
|
||||||
$(top_builddir)/miext/rootless/accel/librlAccel.la \
|
|
||||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
|
||||||
|
|
||||||
Xquartz_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
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
Xquartz.man \
|
|
||||||
darwinClut8.h \
|
darwinClut8.h \
|
||||||
darwin.h \
|
darwin.h \
|
||||||
darwinKeyboard.h
|
darwinKeyboard.h
|
||||||
|
|
|
@ -1,14 +1,21 @@
|
||||||
noinst_LIBRARIES = libXQuartz.a
|
noinst_LTLIBRARIES = libXQuartz.la
|
||||||
|
|
||||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
|
# TODO: This should not pull in rootless... rootless should all be in xpr
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(srcdir) -I$(srcdir)/.. \
|
-I$(srcdir) -I$(srcdir)/.. \
|
||||||
-I$(top_srcdir)/miext/rootless
|
-I$(top_srcdir)/miext/rootless
|
||||||
|
|
||||||
SUBDIRS = xpr
|
if X11APP
|
||||||
|
X11APP_SUBDIRS = apple
|
||||||
|
endif
|
||||||
|
|
||||||
libXQuartz_a_SOURCES = \
|
SUBDIRS = . xpr $(X11APP_SUBDIRS)
|
||||||
|
DIST_SUBDIRS = xpr apple
|
||||||
|
|
||||||
|
libXQuartz_la_SOURCES = \
|
||||||
X11Application.m \
|
X11Application.m \
|
||||||
X11Controller.m \
|
X11Controller.m \
|
||||||
applewm.c \
|
applewm.c \
|
||||||
|
|
|
@ -59,8 +59,7 @@ int X11EnableKeyEquivalents = TRUE;
|
||||||
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
|
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
|
||||||
|
|
||||||
extern int darwinFakeButtons, input_check_flag;
|
extern int darwinFakeButtons, input_check_flag;
|
||||||
// extern Bool enable_stereo;
|
extern Bool enable_stereo;
|
||||||
Bool enable_stereo; //<-- this needs to go back to being an extern once glxCGL is fixed
|
|
||||||
|
|
||||||
extern xEvent *darwinEvents;
|
extern xEvent *darwinEvents;
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
noinst_LIBRARIES = libxpr.a
|
bin_PROGRAMS = Xquartz
|
||||||
|
|
||||||
|
# TODO: This man page needs sed magic and cleanup
|
||||||
|
man1_MANS = Xquartz.man
|
||||||
|
|
||||||
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
|
-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
|
||||||
-I$(top_srcdir)/miext \
|
-I$(top_srcdir)/miext \
|
||||||
-I$(top_srcdir)/miext/rootless \
|
-I$(top_srcdir)/miext/rootless \
|
||||||
-I$(top_srcdir)/miext/rootless/safeAlpha
|
-I$(top_srcdir)/miext/rootless/safeAlpha
|
||||||
|
|
||||||
libxpr_a_SOURCES = \
|
Xquartz_SOURCES = \
|
||||||
appledri.c \
|
appledri.c \
|
||||||
dri.c \
|
dri.c \
|
||||||
xprAppleWM.c \
|
xprAppleWM.c \
|
||||||
|
@ -17,7 +21,45 @@ libxpr_a_SOURCES = \
|
||||||
x-hook.c \
|
x-hook.c \
|
||||||
x-list.c
|
x-list.c
|
||||||
|
|
||||||
|
Xquartz_LDADD = \
|
||||||
|
$(top_builddir)/hw/darwin/quartz/libXquartz.la \
|
||||||
|
$(top_builddir)/hw/darwin/libXdarwin.la \
|
||||||
|
$(top_builddir)/dix/dixfonts.lo \
|
||||||
|
$(top_builddir)/dix/libdix.la \
|
||||||
|
$(top_builddir)/os/libos.la \
|
||||||
|
$(top_builddir)/dix/libxpstubs.la \
|
||||||
|
$(top_builddir)/miext/shadow/libshadow.la \
|
||||||
|
$(top_builddir)/fb/libfb.la \
|
||||||
|
$(top_builddir)/mi/libmi.la \
|
||||||
|
$(top_builddir)/composite/libcomposite.la \
|
||||||
|
$(top_builddir)/damageext/libdamageext.la \
|
||||||
|
$(top_builddir)/miext/damage/libdamage.la \
|
||||||
|
$(top_builddir)/xfixes/libxfixes.la \
|
||||||
|
$(top_builddir)/miext/cw/libcw.la \
|
||||||
|
$(top_builddir)/Xext/libXext.la \
|
||||||
|
$(top_builddir)/xkb/libxkb.la \
|
||||||
|
$(top_builddir)/xkb/libxkbstubs.la \
|
||||||
|
$(top_builddir)/Xi/libXi.la \
|
||||||
|
$(top_builddir)/dbe/libdbe.la \
|
||||||
|
$(top_builddir)/record/librecord.la \
|
||||||
|
$(top_builddir)/XTrap/libxtrap.la \
|
||||||
|
$(top_builddir)/miext/rootless/librootless.la \
|
||||||
|
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
|
||||||
|
$(top_builddir)/miext/rootless/accel/librlAccel.la \
|
||||||
|
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
||||||
|
|
||||||
|
Xquartz_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
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
Xquartz.man \
|
||||||
dri.h \
|
dri.h \
|
||||||
dristruct.h \
|
dristruct.h \
|
||||||
appledri.h \
|
appledri.h \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user