andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Darwin,Rootless: Makefile cleanup

Browse Source 
(cherry picked from commit 9c6d8a035b)
This commit is contained in:
Jeremy Huddleston 2007-11-26 13:04:57 -08:00
parent f3e6d12966
commit 2b2df4f517
13 changed files with 96 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GL/apple/Makefile.am
View File

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

4
configure.ac
View File

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

60
hw/darwin/Makefile.am
View File

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

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,6 +27,9 @@
#ifndef _DARWIN_H
#define _DARWIN_H
//#include "dix-config.h" // This crashes us for some reason...
#define SHAPE
#include <IOKit/IOTypes.h>
#include "inputstr.h"
#include "scrnintstr.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

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

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

22
hw/darwin/quartz/cr/Makefile.am
View File

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

15
hw/darwin/quartz/fullscreen/Makefile.am
View File

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

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

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

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

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

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