xserver: Branch 'xorg-server-1.2-apple'
Ben Byer
bbyer at kemper.freedesktop.org
Mon Nov 12 19:08:53 PST 2007
hw/darwin/Makefile.am | 29 +++++++++++++++++------
hw/darwin/apple/X11.xcodeproj/project.pbxproj | 19 ++++-----------
hw/darwin/launcher/X11.xcodeproj/project.pbxproj | 17 +++----------
3 files changed, 33 insertions(+), 32 deletions(-)
New commits:
commit 51ac429223b9fa61609b97727cc840b07d49ef5c
Author: Ben Byer <bbyer at bbyer.apple.com>
Date: Mon Nov 12 19:08:40 2007 -0800
More build system fixes from Jeremy
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index ccaacfd..d41e7cc 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 a47e4d1..217f07e 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 f82552a..34b76da 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 = (
More information about the xorg-commit
mailing list