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

XQuartz: Tiger build fix 

Fixes: https://trac.macports.org/ticket/33818

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2012-03-30 14:29:48 -07:00
parent eca58ee4db
commit 6cb83b78c4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xquartz/mach-startup/Makefile.am
View File

@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \
mach_startupServer.c \ mach_startupServer.c \
mach_startupUser.c mach_startupUser.c
X11_bin_LDADD = \ X11_bin_DEPENDENCIES = \
$(top_builddir)/hw/xquartz/libXquartz.la \ $(top_builddir)/hw/xquartz/libXquartz.la \
$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
$(top_builddir)/dix/dixfonts.lo \ $(top_builddir)/dix/dixfonts.lo \
@ -31,8 +31,12 @@ X11_bin_LDADD = \
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
$(XQUARTZ_LIBS) $(XSERVER_LIBS) $(XQUARTZ_LIBS) $(XSERVER_LIBS)
# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
# to work around build issues on Tiger.
X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS)
X11_bin_LDFLAGS = \ X11_bin_LDFLAGS = \
$(XSERVER_SYS_LIBS) -lXplugin \ -lXplugin \
-XCClinker -Objc \ -XCClinker -Objc \
-Wl,-u,_miDCInitialize \ -Wl,-u,_miDCInitialize \
-Wl,-framework,Carbon \ -Wl,-framework,Carbon \
@ -41,7 +45,7 @@ X11_bin_LDFLAGS = \
-Wl,-framework,IOKit -Wl,-framework,IOKit
if GLX if GLX
X11_bin_LDADD += \ X11_bin_DEPENDENCIES += \
$(top_builddir)/hw/xquartz/GL/libCGLCore.la \ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \
$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglx.la
@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \
endif endif
if RECORD if RECORD
X11_bin_LDADD += \ X11_bin_DEPENDENCIES += \
$(top_builddir)/record/librecord.la $(top_builddir)/record/librecord.la
endif endif
X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
bin_PROGRAMS = Xquartz bin_PROGRAMS = Xquartz
dist_Xquartz_SOURCES = \ dist_Xquartz_SOURCES = \