diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am index 6f0b68d5f..d3c05ccc7 100644 --- a/GL/apple/Makefile.am +++ b/GL/apple/Makefile.am @@ -1,9 +1,12 @@ +AM_CFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ + -I$(top_srcdir)/GL/mesa/glapi \ -I$(top_srcdir)/hw/darwin/quartz \ - -I$(top_srcdir)/hw/darwin/quartz/cr + -I$(top_srcdir)/hw/darwin/quartz/cr \ + -I$(top_srcdir)/miext/damage if HAVE_AGL_FRAMEWORK noinst_LIBRARIES = libAGLcore.a diff --git a/configure.ac b/configure.ac index b81d786f0..5150c1828 100644 --- a/configure.ac +++ b/configure.ac @@ -2164,6 +2164,8 @@ hw/xgl/glxext/module/Makefile hw/xnest/Makefile hw/xwin/Makefile hw/darwin/Makefile +hw/darwin/apple/Makefile +hw/darwin/launcher/Makefile hw/darwin/quartz/Makefile hw/darwin/quartz/xpr/Makefile hw/kdrive/Makefile diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index 62cbecf1d..1faedcbef 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -1,11 +1,16 @@ -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DINXQUARTZ \ -DUSE_NEW_CLUT \ -DXFree86Server \ -I$(top_srcdir)/miext/rootless -SUBDIRS = quartz utils +if X11APP +X11APP_SUBDIRS = apple launcher +endif + +SUBDIRS = quartz utils $(X11APP_SUBDIRS) +DIST_SUBDIRS = quartz utils apple launcher bin_PROGRAMS = Xquartz man1_MANS = Xquartz.man @@ -26,7 +31,6 @@ Xquartz_LDADD = \ ./quartz/libXquartz.a \ ./quartz/xpr/libxpr.a \ $(top_builddir)/dix/dixfonts.lo \ - $(top_builddir)/config/libconfig.a \ $(top_builddir)/dix/libdix.la \ $(top_builddir)/os/libos.la \ $(top_builddir)/dix/libxpstubs.la \ @@ -60,47 +64,8 @@ Xquartz_LDFLAGS = \ -Wl,-framework,CoreAudio \ -Wl,-framework,IOKit -if X11APP -bin_SCRIPTS = x11app x11launcher - -x11app: - cd apple && xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)" - -x11launcher: - cd launcher && xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)" - -x11app-install: - cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefix) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)" - -x11launcher-install: - cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)" - -x11app-clean: - rm -rf apple/build - -x11launcher-clean: - rm -rf launcher/build - -install-data-hook: x11app-install x11launcher-install -clean-local: x11app-clean x11launcher-clean - -endif - EXTRA_DIST = \ Xquartz.man \ darwinClut8.h \ darwin.h \ - darwinKeyboard.h \ - apple/Info.plist \ - apple/X11.icns \ - apple/bundle-main.c \ - apple/English.lproj/InfoPlist.strings \ - apple/English.lproj/Localizable.strings \ - apple/English.lproj/main.nib/classes.nib \ - apple/English.lproj/main.nib/info.nib \ - apple/English.lproj/main.nib/keyedobjects.nib \ - apple/X11.xcodeproj/project.pbxproj \ - launcher/bundle-main.c \ - launcher/Info.plist \ - launcher/X11.icns \ - launcher/X11.xcodeproj/project.pbxproj + darwinKeyboard.h diff --git a/hw/darwin/apple/Makefile.am b/hw/darwin/apple/Makefile.am new file mode 100644 index 000000000..02a2c25b1 --- /dev/null +++ b/hw/darwin/apple/Makefile.am @@ -0,0 +1,23 @@ +bin_SCRIPTS = x11app + +.PHONY: x11app + +x11app: + xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)" + +install-data-hook: + xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefix) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)" + +clean-local: + rm -rf build + +EXTRA_DIST = \ + Info.plist \ + X11.icns \ + bundle-main.c \ + English.lproj/InfoPlist.strings \ + English.lproj/Localizable.strings \ + English.lproj/main.nib/classes.nib \ + English.lproj/main.nib/info.nib \ + English.lproj/main.nib/keyedobjects.nib \ + X11.xcodeproj/project.pbxproj diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 646bb2488..e2e482955 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -27,7 +27,8 @@ #ifndef _DARWIN_H #define _DARWIN_H -#include "dix-config.h" +// #include "dix-config.h" // This makes us crash for some reason... +#define SHAPE #include #include "inputstr.h" diff --git a/hw/darwin/launcher/Makefile.am b/hw/darwin/launcher/Makefile.am new file mode 100644 index 000000000..c291731d1 --- /dev/null +++ b/hw/darwin/launcher/Makefile.am @@ -0,0 +1,18 @@ +bin_SCRIPTS = x11launcher + +.PHONY: x11launcher + +x11launcher: + xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)" + +install-data-hook: + xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)" + +clean-local: + rm -rf build + +EXTRA_DIST = \ + bundle-main.c \ + Info.plist \ + X11.icns \ + X11.xcodeproj/project.pbxproj diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am index 54e6c30a7..fe6642983 100644 --- a/hw/darwin/quartz/Makefile.am +++ b/hw/darwin/quartz/Makefile.am @@ -1,8 +1,8 @@ noinst_LIBRARIES = libXQuartz.a -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_OBJCFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DHAS_KL_API \ -I$(srcdir) -I$(srcdir)/.. \ -I$(top_srcdir)/miext/rootless diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am index 4fe6e23b6..8f482f1dc 100644 --- a/hw/darwin/quartz/xpr/Makefile.am +++ b/hw/darwin/quartz/xpr/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libxpr.a -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DHAVE_XORG_CONFIG_H \ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ -I$(top_srcdir)/miext \ @@ -9,14 +9,14 @@ AM_CPPFLAGS = $(XORG_INCS) \ libxpr_a_SOURCES = \ appledri.c \ - dri.c \ - xprAppleWM.c \ - xprCursor.c \ - xprFrame.c \ - xprScreen.c \ - x-hash.c \ - x-hook.c \ - x-list.c + dri.c \ + xprAppleWM.c \ + xprCursor.c \ + xprFrame.c \ + xprScreen.c \ + x-hash.c \ + x-hook.c \ + x-list.c EXTRA_DIST = \ dri.h \ diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am index 8dae6d237..aa8528e6a 100644 --- a/miext/rootless/Makefile.am +++ b/miext/rootless/Makefile.am @@ -1,22 +1,19 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support SUBDIRS = safeAlpha accel noinst_LTLIBRARIES = librootless.la librootless_la_SOURCES = \ rootlessCommon.c \ - rootlessCommon.h \ - rootlessConfig.h \ rootlessGC.c \ - rootless.h \ rootlessScreen.c \ rootlessValTree.c \ - rootlessWindow.c \ - rootlessWindow.h + rootlessWindow.c EXTRA_DIST = \ - README.txt + README.txt \ + rootless.h \ + rootlessCommon.h \ + rootlessConfig.h \ + rootlessWindow.h diff --git a/miext/rootless/accel/Makefile.am b/miext/rootless/accel/Makefile.am index c49d5fb47..ca41653b7 100644 --- a/miext/rootless/accel/Makefile.am +++ b/miext/rootless/accel/Makefile.am @@ -1,18 +1,15 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support - +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support noinst_LTLIBRARIES = librlAccel.la -librlAccel_la_SOURCES = rlAccel.c \ - rlBlt.c \ - rlCopy.c \ - rlFill.c \ - rlFillRect.c \ - rlFillSpans.c \ - rlGlyph.c \ - rlSolid.c +librlAccel_la_SOURCES = \ + rlAccel.c \ + rlBlt.c \ + rlCopy.c \ + rlFill.c \ + rlFillRect.c \ + rlFillSpans.c \ + rlGlyph.c \ + rlSolid.c EXTRA_DIST = rlAccel.h diff --git a/miext/rootless/safeAlpha/Makefile.am b/miext/rootless/safeAlpha/Makefile.am index 823fb777d..a22afb6a2 100644 --- a/miext/rootless/safeAlpha/Makefile.am +++ b/miext/rootless/safeAlpha/Makefile.am @@ -1,9 +1,5 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support - +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support noinst_LTLIBRARIES = libsafeAlpha.la libsafeAlpha_la_SOURCES = safeAlphaPicture.c