From 2b2df4f5174b5b263942c7fea3a7f84b08f2a996 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 26 Nov 2007 13:04:57 -0800 Subject: [PATCH] Darwin,Rootless: Makefile cleanup (cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3) --- GL/apple/Makefile.am | 6 ++- configure.ac | 4 +- hw/darwin/Makefile.am | 60 +++++-------------------- hw/darwin/apple/Makefile.am | 23 ++++++++++ hw/darwin/darwin.h | 3 ++ hw/darwin/launcher/Makefile.am | 18 ++++++++ hw/darwin/quartz/Makefile.am | 15 ++----- hw/darwin/quartz/cr/Makefile.am | 22 --------- hw/darwin/quartz/fullscreen/Makefile.am | 15 ------- hw/darwin/quartz/xpr/Makefile.am | 19 +++----- miext/rootless/Makefile.am | 19 ++++---- miext/rootless/accel/Makefile.am | 25 +++++------ miext/rootless/safeAlpha/Makefile.am | 13 +++--- 13 files changed, 96 insertions(+), 146 deletions(-) create mode 100644 hw/darwin/apple/Makefile.am create mode 100644 hw/darwin/launcher/Makefile.am delete mode 100644 hw/darwin/quartz/cr/Makefile.am delete mode 100644 hw/darwin/quartz/fullscreen/Makefile.am diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am index 442c58172..f1e02cccb 100644 --- a/GL/apple/Makefile.am +++ b/GL/apple/Makefile.am @@ -1,3 +1,4 @@ +AM_CFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/GL/glx \ @@ -8,5 +9,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/miext/damage noinst_LIBRARIES = libCGLcore.a -libCGLcore_a_SOURCES = indirect.c \ - $(top_srcdir)/hw/dmx/glxProxy/compsize.c +libCGLcore_a_SOURCES = \ + indirect.c \ + $(top_srcdir)/hw/dmx/glxProxy/compsize.c diff --git a/configure.ac b/configure.ac index 23c3df445..d93597cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -2025,9 +2025,9 @@ 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/cr/Makefile -hw/darwin/quartz/fullscreen/Makefile hw/darwin/quartz/xpr/Makefile hw/darwin/utils/Makefile hw/kdrive/Makefile diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index f4bb6b027..5a674342c 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -1,17 +1,18 @@ -AM_CFLAGS = $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DBUILD_DATE=\"$(BUILD_DATE)\" \ -DHAVE_XORG_CONFIG_H \ -DINXQUARTZ \ -DUSE_NEW_CLUT \ -DXFree86Server \ - -I$(top_srcdir)/fb \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/miext/rootless \ - -I$(top_srcdir)/render \ - -I$(top_srcdir)/Xext + -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 @@ -53,7 +54,7 @@ Xquartz_LDADD = \ $(top_builddir)/miext/rootless/librootless.la \ $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \ $(top_builddir)/miext/rootless/accel/librlAccel.la \ - $(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin + $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin Xquartz_LDFLAGS = \ -XCClinker -Objc \ @@ -65,47 +66,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 468cb6eeb..846ed4c7c 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -27,6 +27,9 @@ #ifndef _DARWIN_H #define _DARWIN_H +//#include "dix-config.h" // This crashes us for some reason... +#define SHAPE + #include #include "inputstr.h" #include "scrnintstr.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 09f86a018..970f64495 100644 --- a/hw/darwin/quartz/Makefile.am +++ b/hw/darwin/quartz/Makefile.am @@ -1,22 +1,15 @@ noinst_LIBRARIES = libXQuartz.a -AM_CFLAGS = $(XORG_CFLAGS) -AM_OBJCFLAGS = $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ - -DXBINDIR=\"${bindir}\" \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DHAS_KL_API \ -DHAVE_XORG_CONFIG_H \ -I$(srcdir) -I$(srcdir)/.. \ - -I$(top_srcdir)/fb \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/miext/rootless \ - -I$(top_srcdir)/render + -I$(top_srcdir)/miext/rootless SUBDIRS = xpr -# Keeping around cr and fullscreen for reference for now, but don't need to build them -DIST_SUBDIRS = cr fullscreen xpr - libXQuartz_a_SOURCES = \ X11Application.m \ X11Controller.m \ diff --git a/hw/darwin/quartz/cr/Makefile.am b/hw/darwin/quartz/cr/Makefile.am deleted file mode 100644 index b200b03dc..000000000 --- a/hw/darwin/quartz/cr/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -noinst_LIBRARIES = libcr.a -AM_CFLAGS = $(XORG_CFLAGS) -AM_OBJCFLAGS = $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ - -DDEFER_NSWINDOW \ - -I../fullscreen \ - -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/miext/rootless \ - -I$(top_srcdir)/miext/rootless/safeAlpha \ - -I$(top_srcdir)/render - -libcr_a_SOURCES = \ - crAppleWM.m \ - crFrame.m \ - crScreen.m \ - ../fullscreen/quartzCursor.c \ - XView.m - -EXTRA_DIST = \ - cr.h \ - XView.h diff --git a/hw/darwin/quartz/fullscreen/Makefile.am b/hw/darwin/quartz/fullscreen/Makefile.am deleted file mode 100644 index 823cec112..000000000 --- a/hw/darwin/quartz/fullscreen/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LIBRARIES = libfullscreen.a -AM_CFLAGS = $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ - -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(top_srcdir)/miext/damage \ - -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/mi - -libfullscreen_a_SOURCES = \ - fullscreen.c \ - quartzCursor.c - -EXTRA_DIST = \ - quartzCursor.h - diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am index d45c07129..8f482f1dc 100644 --- a/hw/darwin/quartz/xpr/Makefile.am +++ b/hw/darwin/quartz/xpr/Makefile.am @@ -1,15 +1,11 @@ noinst_LIBRARIES = libxpr.a -AM_CFLAGS = $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ - -DHAVE_XORG_CONFIG_H \ - -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ - -I$(top_srcdir)/fb \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/miext \ - -I$(top_srcdir)/miext/damage \ - -I$(top_srcdir)/miext/rootless \ - -I$(top_srcdir)/miext/rootless/safeAlpha \ - -I$(top_srcdir)/render +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ + -DHAVE_XORG_CONFIG_H \ + -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ + -I$(top_srcdir)/miext \ + -I$(top_srcdir)/miext/rootless \ + -I$(top_srcdir)/miext/rootless/safeAlpha libxpr_a_SOURCES = \ appledri.c \ @@ -32,4 +28,3 @@ EXTRA_DIST = \ x-list.h \ Xplugin.h \ xpr.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 7592c1840..d26439335 100644 --- a/miext/rootless/safeAlpha/Makefile.am +++ b/miext/rootless/safeAlpha/Makefile.am @@ -1,12 +1,9 @@ -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 \ - safeAlphaWindow.c +libsafeAlpha_la_SOURCES = \ + safeAlphaPicture.c \ + safeAlphaWindow.c EXTRA_DIST = safeAlpha.h