frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xquartz: Update autotools-based builds of XQuartz to account for recent changes 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-21 11:46:14 -07:00
parent 4ea6f661ed
commit 6bb98fc62d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xquartz/Makefile.am
View File

@ -3,6 +3,7 @@ AM_CFLAGS = $(DIX_CFLAGS)
AM_OBJCFLAGS = $(DIX_CFLAGS) AM_OBJCFLAGS = $(DIX_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXSERVER_VERSION=\"$(VERSION)\" \ -DXSERVER_VERSION=\"$(VERSION)\" \
-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\" \
-DUSE_NEW_CLUT \ -DUSE_NEW_CLUT \
-DXFree86Server \ -DXFree86Server \
-I$(top_srcdir)/miext/rootless \ -I$(top_srcdir)/miext/rootless \
@ -21,6 +22,7 @@ DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
libXquartz_la_SOURCES = \ libXquartz_la_SOURCES = \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/mi/miinitext.h \ $(top_srcdir)/mi/miinitext.h \
NSUserDefaults+XQuartzDefaults.m \
X11Application.m \ X11Application.m \
X11Controller.m \ X11Controller.m \
applewm.c \ applewm.c \
@ -36,6 +38,7 @@ libXquartz_la_SOURCES = \
libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la
EXTRA_DIST = \ EXTRA_DIST = \
NSUserDefaults+XQuartzDefaults.h \
X11Application.h \ X11Application.h \
X11Controller.h \ X11Controller.h \
applewmExt.h \ applewmExt.h \

3
hw/xquartz/bundle/Makefile.am
View File

@ -23,9 +23,6 @@ noinst_DATA = $(noinst_PRE:plist.cpp=plist)
CLEANFILES = $(noinst_DATA) CLEANFILES = $(noinst_DATA)
resourcedir=$(libdir)/X11/xserver
resource_DATA = Xquartz.plist
EXTRA_DIST = \ EXTRA_DIST = \
mk_bundke.sh \ mk_bundke.sh \
X11.sh \ X11.sh \

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

@ -1,4 +1,4 @@
AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\" AM_CPPFLAGS=-I..
AM_CFLAGS=$(XPBPROXY_CFLAGS) AM_CFLAGS=$(XPBPROXY_CFLAGS)
AM_OBJCFLAGS=$(XPBPROXY_CFLAGS) AM_OBJCFLAGS=$(XPBPROXY_CFLAGS)
@ -15,7 +15,7 @@ libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)
if STANDALONE_XPBPROXY if STANDALONE_XPBPROXY
bin_PROGRAMS = xpbproxy bin_PROGRAMS = xpbproxy
xpbproxy_SOURCES = app-main.m xpbproxy_SOURCES = app-main.m ../NSUserDefaults+XQuartzDefaults.m
xpbproxy_LDADD = libxpbproxy.la xpbproxy_LDADD = libxpbproxy.la
xpbproxy_LDFLAGS = -Wl,-framework,Cocoa xpbproxy_LDFLAGS = -Wl,-framework,Cocoa