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

XDarwin: changes to Makefile.am to use new conditionals

This commit is contained in:
Ben Byer 2007-09-19 01:52:58 -07:00
parent 170fc77d9e
commit 7813392d1c
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/darwin/Makefile.am
View File

@ -9,6 +9,8 @@ DEFS = @DEFS@ -DUSE_NEW_CLUT
if XQUARTZ if XQUARTZ
XQUARTZ_SUBDIRS = bundle quartz XQUARTZ_SUBDIRS = bundle quartz
XQUARTZ_PROGS = Xquartz
HOOK_TARGETS = xquartz-install-hook
endif endif
SUBDIRS = \ SUBDIRS = \
@ -17,18 +19,18 @@ SUBDIRS = \
utils \ utils \
. .
darwinappdir = @APPLE_APPLICATIONS_DIR@/XDarwin.app
libdarwinShared_a_SOURCES = darwin.c \ libdarwinShared_a_SOURCES = darwin.c \
darwinEvents.c \ darwinEvents.c \
darwinKeyboard.c \ darwinKeyboard.c \
$(darwin_XINPUT_SRCS) $(darwin_XINPUT_SRCS)
bin_PROGRAMS = XDarwin Xquartz # bin_PROGRAMS = XDarwin Xquartz
XDarwin_SOURCES = \ bin_PROGRAMS = $(XQUARTZ_PROGS)
$(top_srcdir)/fb/fbcmap_mi.c \
$(top_srcdir)/mi/miinitext.c \ #XDarwin_SOURCES = \
$(top_srcdir)/Xi/stubs.c # $(top_srcdir)/fb/fbcmap_mi.c \
# $(top_srcdir)/mi/miinitext.c \
# $(top_srcdir)/Xi/stubs.c
Xquartz_SOURCES = \ Xquartz_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \ $(top_srcdir)/fb/fbcmap_mi.c \
@ -68,22 +70,22 @@ DARWIN_LIBS = \
./libdarwinShared.a \ ./libdarwinShared.a \
$(XSERVER_LIBS) $(XSERVER_LIBS)
XDARWIN_LIBS = \ #XDARWIN_LIBS = \
$(DARWIN_LIBS) \ # $(DARWIN_LIBS) \
./iokit/libiokit.a # ./iokit/libiokit.a
XQUARTZ_LIBS = \ XQUARTZ_LIBS = \
$(DARWIN_LIBS) $(DARWIN_LIBS)
XDarwin_DEPENDENCIES = $(XDARWIN_LIBS) #XDarwin_DEPENDENCIES = $(XDARWIN_LIBS)
XDarwin_LDADD = $(XDARWIN_LIBS) $(XSERVER_SYS_LIBS) #XDarwin_LDADD = $(XDARWIN_LIBS) $(XSERVER_SYS_LIBS)
Xquartz_DEPENDENCIES = $(XQUARTZ_LIBS) Xquartz_DEPENDENCIES = $(XQUARTZ_LIBS)
Xquartz_LDADD = $(XQUARTZ_LIBS) $(XSERVER_SYS_LIBS) -lXplugin Xquartz_LDADD = $(XQUARTZ_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
XDarwin_LDFLAGS = \ #XDarwin_LDFLAGS = \
-XCClinker -Objc \ # -XCClinker -Objc \
-Wl,-u,_miDCInitialize \ # -Wl,-u,_miDCInitialize \
-Wl,-framework,IOKit # -Wl,-framework,IOKit
Xquartz_LDFLAGS = \ Xquartz_LDFLAGS = \
-XCClinker -Objc \ -XCClinker -Objc \
@ -95,19 +97,23 @@ Xquartz_LDFLAGS = \
-Wl,-framework,CoreAudio \ -Wl,-framework,CoreAudio \
-Wl,-framework,IOKit -Wl,-framework,IOKit
XDarwin_CFLAGS = -DINXDARWIN #XDarwin_CFLAGS = -DINXDARWIN
Xquartz_CFLAGS = -DINXQUARTZ -DHAS_CG_MACH_PORT -DHAS_KL_API -DHAVE_XORG_CONFIG_H Xquartz_CFLAGS = -DINXQUARTZ -DHAS_CG_MACH_PORT -DHAS_KL_API -DHAVE_XORG_CONFIG_H
if XQUARTZ if XQUARTZ
macosdir = $(darwinappdir)/Contents/MacOS
DEFS += -DDARWIN_WITH_QUARTZ -DXFree86Server DEFS += -DDARWIN_WITH_QUARTZ -DXFree86Server
macos_PROGRAMS = XDarwinApp bin_SCRIPTS = x11app
macos_SCRIPTS = x11app
x11app: x11app:
cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)" cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
endif
if XDARWINAPP
macosdir = $(darwinappdir)/Contents/MacOS
macos_PROGRAMS = XDarwinApp
darwinappdir = @APPLE_APPLICATIONS_DIR@/XDarwin.app
XDarwinApp_SOURCES = \ XDarwinApp_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \ $(top_srcdir)/fb/fbcmap_mi.c \
@ -134,8 +140,6 @@ XDarwinApp_LDFLAGS = \
-Wl,-framework,IOKit -Wl,-framework,IOKit
XDarwinApp_CFLAGS = -DINXDARWINAPP XDarwinApp_CFLAGS = -DINXDARWINAPP
HOOK_TARGETS = xquartz-install-hook
crplugindir = $(darwinappdir)/Contents/Resources/cr.bundle/Contents/MacOS crplugindir = $(darwinappdir)/Contents/Resources/cr.bundle/Contents/MacOS
crplugin_LTLIBRARIES = cr.la crplugin_LTLIBRARIES = cr.la
@ -190,7 +194,6 @@ glxMesa_la_LDFLAGS = -shrext '' \
glxMesa_la_DEPENDENCIES = XDarwinApp glxMesa_la_DEPENDENCIES = XDarwinApp
endif endif
endif
if HAVE_XPLUGIN if HAVE_XPLUGIN
xprplugindir = $(darwinappdir)/Contents/Resources/xpr.bundle/Contents/MacOS xprplugindir = $(darwinappdir)/Contents/Resources/xpr.bundle/Contents/MacOS
@ -254,6 +257,7 @@ glxAGL_la_DEPENDENCIES = XDarwinApp
endif
endif endif
man1_MANS = XDarwin.man man1_MANS = XDarwin.man