frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Darwin,Rootless: Makefile cleanup 

(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
This commit is contained in:
Jeremy Huddleston 2007-11-26 13:04:57 -08:00
parent a344920ae8
commit 601307615e
11 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GL/apple/Makefile.am
View File

@ -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

2
configure.ac
View File

@ -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

53
hw/darwin/Makefile.am
View File

@ -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

23
hw/darwin/apple/Makefile.am Normal file
View File

@ -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

3
hw/darwin/darwin.h
View File

@ -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 <IOKit/IOTypes.h>
#include "inputstr.h"

18
hw/darwin/launcher/Makefile.am Normal file
View File

@ -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

6
hw/darwin/quartz/Makefile.am
View File

@ -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

20
hw/darwin/quartz/xpr/Makefile.am
View File

@ -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 \

19
miext/rootless/Makefile.am
View File

@ -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

25
miext/rootless/accel/Makefile.am
View File

@ -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

8
miext/rootless/safeAlpha/Makefile.am
View File

@ -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