Synchronised line endinge with release branch

1 files changed, 84 insertions, 84 deletions

diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am
index 388ecfa2a..0b1f8977e 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.am
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am
@@ -1,84 +1,84 @@
-AM_CPPFLAGS = \

-	-I$(srcdir)/.. \

-	-DBUILD_DATE=\"$(BUILD_DATE)\" \

-	-DXSERVER_VERSION=\"$(VERSION)\" \

-	-DX11BINDIR=\"$(bindir)\"

-

-AM_CFLAGS = $(DIX_CFLAGS)

-

-x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS

-x11app_PROGRAMS = X11.bin

-

-dist_X11_bin_SOURCES = \

-	bundle-main.c 

-

-nodist_X11_bin_SOURCES = \

-	mach_startupServer.c \

-	mach_startupUser.c

-

-X11_bin_LDADD = \

-	$(top_builddir)/hw/xquartz/libXquartz.la \

-	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \

-	$(top_builddir)/dix/dixfonts.lo \

-	$(top_builddir)/miext/rootless/librootless.la \

-	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \

-	$(XQUARTZ_LIBS) $(XSERVER_LIBS)

-

-X11_bin_LDFLAGS =  \

-	$(XSERVER_SYS_LIBS) -lXplugin \

-	-XCClinker -Objc \

-	-Wl,-u,_miDCInitialize \

-	-Wl,-framework,Carbon \

-	-Wl,-framework,Cocoa \

-	-Wl,-framework,CoreAudio \

-	-Wl,-framework,IOKit

-

-if GLX

-X11_bin_LDADD += \

-	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \

-	$(top_builddir)/glx/libglx.la

-

-X11_bin_LDFLAGS += \

-	-Wl,-framework,OpenGL

-endif

-

-if XQUARTZ_SPARKLE

-X11_bin_LDFLAGS += \

-	-Wl,-framework,Sparkle

-endif

-

-if RECORD

-X11_bin_LDADD += \

-	$(top_builddir)/record/librecord.la

-endif

-

-X11_bin_DEPENDENCIES = $(X11_bin_LDADD)

-

-bin_PROGRAMS = Xquartz

-

-dist_Xquartz_SOURCES = \

-	stub.c \

-	launchd_fd.c

-

-nodist_Xquartz_SOURCES = \

-	mach_startupUser.c

-

-Xquartz_LDFLAGS =  \

-	-Wl,-framework,CoreServices

-

-BUILT_SOURCES = \

-	mach_startupServer.c \

-	mach_startupUser.c \

-	mach_startupServer.h \

-	mach_startup.h

-

-CLEANFILES = \

-	$(BUILT_SOURCES)

-

-$(BUILT_SOURCES): $(srcdir)/mach_startup.defs

-	mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs

-

-EXTRA_DIST = \

-	launchd_fd.h \

-	mach_startup.defs \

-	mach_startup_types.h

+AM_CPPFLAGS = \
+	-I$(srcdir)/.. \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\" \
+	-DX11BINDIR=\"$(bindir)\"
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS
+x11app_PROGRAMS = X11.bin
+
+dist_X11_bin_SOURCES = \
+	bundle-main.c 
+
+nodist_X11_bin_SOURCES = \
+	mach_startupServer.c \
+	mach_startupUser.c
+
+X11_bin_LDADD = \
+	$(top_builddir)/hw/xquartz/libXquartz.la \
+	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
+	$(top_builddir)/dix/dixfonts.lo \
+	$(top_builddir)/miext/rootless/librootless.la \
+	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
+	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
+
+X11_bin_LDFLAGS =  \
+	$(XSERVER_SYS_LIBS) -lXplugin \
+	-XCClinker -Objc \
+	-Wl,-u,_miDCInitialize \
+	-Wl,-framework,Carbon \
+	-Wl,-framework,Cocoa \
+	-Wl,-framework,CoreAudio \
+	-Wl,-framework,IOKit
+
+if GLX
+X11_bin_LDADD += \
+	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+	$(top_builddir)/glx/libglx.la
+
+X11_bin_LDFLAGS += \
+	-Wl,-framework,OpenGL
+endif
+
+if XQUARTZ_SPARKLE
+X11_bin_LDFLAGS += \
+	-Wl,-framework,Sparkle
+endif
+
+if RECORD
+X11_bin_LDADD += \
+	$(top_builddir)/record/librecord.la
+endif
+
+X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
+
+bin_PROGRAMS = Xquartz
+
+dist_Xquartz_SOURCES = \
+	stub.c \
+	launchd_fd.c
+
+nodist_Xquartz_SOURCES = \
+	mach_startupUser.c
+
+Xquartz_LDFLAGS =  \
+	-Wl,-framework,CoreServices
+
+BUILT_SOURCES = \
+	mach_startupServer.c \
+	mach_startupUser.c \
+	mach_startupServer.h \
+	mach_startup.h
+
+CLEANFILES = \
+	$(BUILT_SOURCES)
+
+$(BUILT_SOURCES): $(srcdir)/mach_startup.defs
+	mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs
+
+EXTRA_DIST = \
+	launchd_fd.h \
+	mach_startup.defs \
+	mach_startup_types.h