fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 13:48:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More build system fixes from Jeremy

Browse source
This commit is contained in:
Ben Byer 2007-11-12 19:08:40 -08:00 • committed by Jeremy Huddleston
parent 1c8e5994c6
commit 10ecb31cd1
3 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
hw/darwin/Makefile.am
View file

@ -14,8 +14,12 @@ endif
SUBDIRS = \ SUBDIRS = \
iokit \ iokit \
$(XQUARTZ_SUBDIRS) \ $(XQUARTZ_SUBDIRS) \
utils \ utils
.
DIST_SUBDIRS = \
iokit \
quartz \
utils
libdarwinShared_a_SOURCES = darwin.c \ libdarwinShared_a_SOURCES = darwin.c \
darwinEvents.c \ darwinEvents.c \
@ -139,18 +143,25 @@ x11app:
x11launcher: x11launcher:
cd launcher && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)" cd launcher && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
x11app-install-hook: x11app-install:
cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefixdir) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO 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 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 endif
man1_MANS = XDarwin.man man1_MANS = XDarwin.man
install-data-hook: $(HOOK_TARGETS)
EXTRA_DIST = \ EXTRA_DIST = \
darwin.c \ darwin.c \
darwinClut8.h \ darwinClut8.h \
@ -171,4 +182,8 @@ EXTRA_DIST = \
apple/English.lproj/main.nib/info.nib \ apple/English.lproj/main.nib/info.nib \
apple/English.lproj/main.nib/keyedobjects.nib \ apple/English.lproj/main.nib/keyedobjects.nib \
apple/X11.xcodeproj/project.pbxproj \ apple/X11.xcodeproj/project.pbxproj \
launcher/bundle-main.c \
launcher/Info.plist \
launcher/X11.icns \
launcher/X11.xcodeproj/project.pbxproj \
XDarwin.man XDarwin.man

19
hw/darwin/apple/X11.xcodeproj/project.pbxproj
View file

@ -207,38 +207,33 @@
527F24090B5D8FFC007840A7 /* Development */ = { 527F24090B5D8FFC007840A7 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Development; name = Development;
}; };
527F240A0B5D8FFC007840A7 /* Deployment */ = { 527F240A0B5D8FFC007840A7 /* Deployment */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Deployment; name = Deployment;
}; };
527F240B0B5D8FFC007840A7 /* Default */ = { 527F240B0B5D8FFC007840A7 /* Default */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Default; name = Default;
}; };
527F24230B5D938C007840A7 /* Development */ = { 527F24230B5D938C007840A7 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_32_BIT)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $DSTROOT/Applications/Utilties; INSTALL_PATH = /usr/X11;
LIBRARY_SEARCH_PATHS = /usr/X11/lib; LIBRARY_SEARCH_PATHS = /usr/X11/lib;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
@ -262,12 +257,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $DSTROOT/Applications/Utilties; INSTALL_PATH = /usr/X11;
LIBRARY_SEARCH_PATHS = /usr/X11/lib; LIBRARY_SEARCH_PATHS = /usr/X11/lib;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
@ -290,12 +284,11 @@
527F24250B5D938C007840A7 /* Default */ = { 527F24250B5D938C007840A7 /* Default */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $DSTROOT/Applications/Utilties; INSTALL_PATH = /usr/X11;
LIBRARY_SEARCH_PATHS = /usr/X11/lib; LIBRARY_SEARCH_PATHS = /usr/X11/lib;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (

17
hw/darwin/launcher/X11.xcodeproj/project.pbxproj
View file

@ -164,33 +164,28 @@
527F24090B5D8FFC007840A7 /* Development */ = { 527F24090B5D8FFC007840A7 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Development; name = Development;
}; };
527F240A0B5D8FFC007840A7 /* Deployment */ = { 527F240A0B5D8FFC007840A7 /* Deployment */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Deployment; name = Deployment;
}; };
527F240B0B5D8FFC007840A7 /* Default */ = { 527F240B0B5D8FFC007840A7 /* Default */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)"; INSTALL_MODE_FLAG = "a+rX";
SKIP_INSTALL = YES;
}; };
name = Default; name = Default;
}; };
527F24230B5D938C007840A7 /* Development */ = { 527F24230B5D938C007840A7 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_32_BIT)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
@ -219,12 +214,11 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $DSTROOT/Applications/Utilties; INSTALL_PATH = /Applications/Utilties;
LIBRARY_SEARCH_PATHS = /usr/X11/lib; LIBRARY_SEARCH_PATHS = /usr/X11/lib;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
@ -243,12 +237,11 @@
527F24250B5D938C007840A7 /* Default */ = { 527F24250B5D938C007840A7 /* Default */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DSTROOT = "$(DSTROOT)";
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = /usr/X11/include; HEADER_SEARCH_PATHS = /usr/X11/include;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $DSTROOT/Applications/Utilties; INSTALL_PATH = /Applications/Utilties;
LIBRARY_SEARCH_PATHS = /usr/X11/lib; LIBRARY_SEARCH_PATHS = /usr/X11/lib;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (