From 09019357629e85e42a63b9aa07b4e708424965cb Mon Sep 17 00:00:00 2001 From: Ben Byer Date: Mon, 12 Nov 2007 19:08:40 -0800 Subject: [PATCH] More build system fixes from Jeremy --- hw/darwin/Makefile.am | 29 ++++++++++++++----- hw/darwin/apple/X11.xcodeproj/project.pbxproj | 19 ++++-------- .../launcher/X11.xcodeproj/project.pbxproj | 17 ++++------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index ccaacfde2..d41e7cc97 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -13,8 +13,12 @@ endif SUBDIRS = \ iokit \ $(XQUARTZ_SUBDIRS) \ - utils \ - . + utils + +DIST_SUBDIRS = \ + iokit \ + quartz \ + utils libdarwinShared_a_SOURCES = darwin.c \ darwinEvents.c \ @@ -138,18 +142,25 @@ x11app: x11launcher: cd launcher && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)" -x11app-install-hook: - cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefixdir) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO +x11app-install: + cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefix) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO + +x11launcher-install: cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO -HOOK_TARGETS = x11app-install-hook +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 man1_MANS = XDarwin.man -install-data-hook: $(HOOK_TARGETS) - EXTRA_DIST = \ darwin.c \ darwinClut8.h \ @@ -170,4 +181,8 @@ EXTRA_DIST = \ 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 \ XDarwin.man diff --git a/hw/darwin/apple/X11.xcodeproj/project.pbxproj b/hw/darwin/apple/X11.xcodeproj/project.pbxproj index a47e4d157..217f07e52 100644 --- a/hw/darwin/apple/X11.xcodeproj/project.pbxproj +++ b/hw/darwin/apple/X11.xcodeproj/project.pbxproj @@ -207,38 +207,33 @@ 527F24090B5D8FFC007840A7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Development; }; 527F240A0B5D8FFC007840A7 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Deployment; }; 527F240B0B5D8FFC007840A7 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Default; }; 527F24230B5D938C007840A7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_32_BIT)"; COPY_PHASE_STRIP = NO; - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = $DSTROOT/Applications/Utilties; + INSTALL_PATH = /usr/X11; LIBRARY_SEARCH_PATHS = /usr/X11/lib; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -262,12 +257,11 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = $DSTROOT/Applications/Utilties; + INSTALL_PATH = /usr/X11; LIBRARY_SEARCH_PATHS = /usr/X11/lib; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -290,12 +284,11 @@ 527F24250B5D938C007840A7 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = $DSTROOT/Applications/Utilties; + INSTALL_PATH = /usr/X11; LIBRARY_SEARCH_PATHS = /usr/X11/lib; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/hw/darwin/launcher/X11.xcodeproj/project.pbxproj b/hw/darwin/launcher/X11.xcodeproj/project.pbxproj index f82552ac5..34b76dafb 100644 --- a/hw/darwin/launcher/X11.xcodeproj/project.pbxproj +++ b/hw/darwin/launcher/X11.xcodeproj/project.pbxproj @@ -164,33 +164,28 @@ 527F24090B5D8FFC007840A7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Development; }; 527F240A0B5D8FFC007840A7 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Deployment; }; 527F240B0B5D8FFC007840A7 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; - SKIP_INSTALL = YES; + INSTALL_MODE_FLAG = "a+rX"; }; name = Default; }; 527F24230B5D938C007840A7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_32_BIT)"; COPY_PHASE_STRIP = NO; - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; @@ -219,12 +214,11 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = $DSTROOT/Applications/Utilties; + INSTALL_PATH = /Applications/Utilties; LIBRARY_SEARCH_PATHS = /usr/X11/lib; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -243,12 +237,11 @@ 527F24250B5D938C007840A7 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - DSTROOT = "$(DSTROOT)"; FRAMEWORK_SEARCH_PATHS = ""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = /usr/X11/include; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = $DSTROOT/Applications/Utilties; + INSTALL_PATH = /Applications/Utilties; LIBRARY_SEARCH_PATHS = /usr/X11/lib; OTHER_CFLAGS = ""; OTHER_LDFLAGS = (