Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/xfree86 move buildin...
details: https://anonhg.NetBSD.org/src/rev/1e6d5487a77e
branches: trunk
changeset: 763628:1e6d5487a77e
user: plunky <plunky%NetBSD.org@localhost>
date: Mon Mar 28 10:08:06 2011 +0000
description:
move building of Xorg server into a SUBDIR since it is created from
the other subdir contents, ok by mrg@
(this makes "make all" and "make dependall" do the same thing)
diffstat:
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile | 129 +---------
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 129 ++++++++++
2 files changed, 131 insertions(+), 127 deletions(-)
diffs (275 lines):
diff -r 963cf488eb3a -r 1e6d5487a77e external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Mon Mar 28 00:37:40 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Mon Mar 28 10:08:06 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/03/06 22:15:30 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2011/03/28 10:08:06 plunky Exp $
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
@@ -11,131 +11,6 @@
SUBDIR+= .WAIT utils
-.include <bsd.own.mk>
-
-.include "../../Makefile.Xserver"
-
-PROG= Xorg
-BINMODE= 4711
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
-SRCS= xorg.c libxorg.c
-
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xorg-server}/fb \
- -I${X11SRCDIR.xorg-server}/mi \
- -I${X11SRCDIR.xorg-server}/include \
- -I${X11SRCDIR.xorg-server}/os \
- -I${X11SRCDIR.xorg-server}/Xext \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${DESTDIR}${X11INCDIR}/xorg \
- -I${X11SRCDIR.xorg-server}/render \
- -DHAVE_DIX_CONFIG_H
-
-CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
- ${X11FLAGS.EXTENSION}
-
-LDFLAGS+= -rdynamic
-
-LDADD+= -Wl,--whole-archive
-LDADD+= ${LDADD.dix}
-LDADD+= ${LDADD.hw/xfree86/init}
-LDADD+= ${LDADD.config}
-LDADD+= ${LDADD.hw/xfree86/loader}
-LDADD+= ${LDADD.hw/xfree86/common}
-LDADD+= ${LDADD.hw/xfree86/xorgos}
-#LDADD+= ${LDADD.osandcommon}
-LDADD+= ${LDADD.hw/xfree86/xf86config}
-LDADD+= ${LDADD.hw/xfree86/dixmods}
-LDADD+= ${LDADD.hw/xfree86/xf86modes}
-LDADD+= ${LDADD.hw/xfree86/ramdac}
-LDADD+= ${LDADD.hw/xfree86/ddc}
-LDADD+= ${LDADD.hw/xfree86/i2c}
-LDADD+= ${LDADD.composite}
-LDADD+= ${LDADD.mi}
-LDADD+= ${LDADD.xfixes}
-LDADD+= ${LDADD.Xext/Xextbuiltin}
-LDADD+= ${LDADD.render}
-LDADD+= ${LDADD.randr}
-LDADD+= ${LDADD.damageext}
-LDADD+= ${LDADD.miext/damage}
-LDADD+= ${LDADD.miext/shadow}
-LDADD+= ${LDADD.miext/cw}
-LDADD+= ${LDADD.Xi}
-LDADD+= ${LDADD.xkb}
-LDADD+= ${LDADD.os}
-LDADD+= ${LDADD.glx}
-LDADD+= ${LDADD.hw/xfree86/dri}
-LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
-LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
-LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
-LDADD+= -lpciaccess -ldrm
-LDADD+= -lcrypto
-LDADD+= -Wl,--no-whole-archive
+SUBDIR+= .WAIT Xorg
-.if ${MACHINE_ARCH} == "i386"
-LDADD+= -li386
-DPADD+= ${LIBI386}
-.elif ${MACHINE_ARCH} == "x86_64"
-LDADD+= -lx86_64
-DPADD+= ${LIBX86_64}
-.elif ${MACHINE_ARCH} == "alpha"
-LDADD+= -lalpha
-DPADD+= ${LIBALPHA}
-.endif
-
-LDADD+= -lm
-
-DPADD+= ${DPADD.dix} \
- ${DPADD.fb} \
- ${DPADD.mi} \
- ${DPADD.xfixes} \
- ${DPADD.Xext} \
- ${DPADD.config} \
- ${DPADD.dbe} \
- ${DPADD.record} \
- ${DPADD.render} \
- ${DPADD.randr} \
- ${DPADD.damageext} \
- ${DPADD.miext/damage} \
- ${DPADD.miext/shadow} \
- ${DPADD.miext/cw} \
- ${DPADD.Xi} \
- ${DPADD.xkb} \
- ${DPADD.composite} \
- ${DPADD.os} \
- ${DPADD.glx} \
- ${DPADD.hw/xfree86/dri} \
- ${DPADD.hw/xfree86/dixmods/fb} \
- ${DPADD.hw/xfree86/fb} \
- ${DPADD.hw/xfree86/init} \
- ${DPADD.hw/xfree86/loader} \
- ${DPADD.hw/xfree86/xf86config} \
- ${DPADD.hw/xfree86/dixmods} \
- ${DPADD.hw/xfree86/xf86modes} \
- ${DPADD.hw/xfree86/ramdac} \
- ${DPADD.hw/xfree86/ddc} \
- ${DPADD.hw/xfree86/i2c} \
- ${LIBCWRAPPER} \
- ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBCRYPTO}
-
-SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
-
-# XXX
-#Xorg.1: Xorg.man.pre
-# cp ${.ALLSRC} ${.TARGET}
-MKMAN= no
-
-FILES= xorg-server.m4
-FILESDIR= ${X11ROOTDIR}/share/aclocal
-
-.PATH: ${X11SRCDIR.xorg-server}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
.include <bsd.subdir.mk>
-.include <bsd.files.mk>
diff -r 963cf488eb3a -r 1e6d5487a77e external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Mon Mar 28 10:08:06 2011 +0000
@@ -0,0 +1,129 @@
+# $NetBSD: Makefile,v 1.1 2011/03/28 10:08:06 plunky Exp $
+
+.include <bsd.own.mk>
+
+.include "../../../Makefile.Xserver"
+
+PROG= Xorg
+BINMODE= 4711
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
+SRCS= xorg.c libxorg.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xorg-server}/fb \
+ -I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/os \
+ -I${X11SRCDIR.xorg-server}/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/render \
+ -DHAVE_DIX_CONFIG_H
+
+CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
+ ${X11FLAGS.EXTENSION}
+
+LDFLAGS+= -rdynamic
+
+LDADD+= -Wl,--whole-archive
+LDADD+= ${LDADD.dix}
+LDADD+= ${LDADD.hw/xfree86/init}
+LDADD+= ${LDADD.config}
+LDADD+= ${LDADD.hw/xfree86/loader}
+LDADD+= ${LDADD.hw/xfree86/common}
+LDADD+= ${LDADD.hw/xfree86/xorgos}
+#LDADD+= ${LDADD.osandcommon}
+LDADD+= ${LDADD.hw/xfree86/xf86config}
+LDADD+= ${LDADD.hw/xfree86/dixmods}
+LDADD+= ${LDADD.hw/xfree86/xf86modes}
+LDADD+= ${LDADD.hw/xfree86/ramdac}
+LDADD+= ${LDADD.hw/xfree86/ddc}
+LDADD+= ${LDADD.hw/xfree86/i2c}
+LDADD+= ${LDADD.composite}
+LDADD+= ${LDADD.mi}
+LDADD+= ${LDADD.xfixes}
+LDADD+= ${LDADD.Xext/Xextbuiltin}
+LDADD+= ${LDADD.render}
+LDADD+= ${LDADD.randr}
+LDADD+= ${LDADD.damageext}
+LDADD+= ${LDADD.miext/damage}
+LDADD+= ${LDADD.miext/shadow}
+LDADD+= ${LDADD.miext/cw}
+LDADD+= ${LDADD.Xi}
+LDADD+= ${LDADD.xkb}
+LDADD+= ${LDADD.os}
+LDADD+= ${LDADD.glx}
+LDADD+= ${LDADD.hw/xfree86/dri}
+LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
+LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
+LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
+LDADD+= -lpciaccess -ldrm
+LDADD+= -lcrypto
+LDADD+= -Wl,--no-whole-archive
+
+.if ${MACHINE_ARCH} == "i386"
+LDADD+= -li386
+DPADD+= ${LIBI386}
+.elif ${MACHINE_ARCH} == "x86_64"
+LDADD+= -lx86_64
+DPADD+= ${LIBX86_64}
+.elif ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
+.endif
+
+LDADD+= -lm
+
+DPADD+= ${DPADD.dix} \
+ ${DPADD.fb} \
+ ${DPADD.mi} \
+ ${DPADD.xfixes} \
+ ${DPADD.Xext} \
+ ${DPADD.config} \
+ ${DPADD.dbe} \
+ ${DPADD.record} \
+ ${DPADD.render} \
+ ${DPADD.randr} \
+ ${DPADD.damageext} \
+ ${DPADD.miext/damage} \
+ ${DPADD.miext/shadow} \
+ ${DPADD.miext/cw} \
+ ${DPADD.Xi} \
+ ${DPADD.xkb} \
+ ${DPADD.composite} \
+ ${DPADD.os} \
+ ${DPADD.glx} \
+ ${DPADD.hw/xfree86/dri} \
+ ${DPADD.hw/xfree86/dixmods/fb} \
+ ${DPADD.hw/xfree86/fb} \
+ ${DPADD.hw/xfree86/init} \
+ ${DPADD.hw/xfree86/loader} \
+ ${DPADD.hw/xfree86/xf86config} \
+ ${DPADD.hw/xfree86/dixmods} \
+ ${DPADD.hw/xfree86/xf86modes} \
+ ${DPADD.hw/xfree86/ramdac} \
+ ${DPADD.hw/xfree86/ddc} \
+ ${DPADD.hw/xfree86/i2c} \
+ ${LIBCWRAPPER} \
+ ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
+ ${LIBCRYPTO}
+
+SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
+
+# XXX
+#Xorg.1: Xorg.man.pre
+# cp ${.ALLSRC} ${.TARGET}
+MKMAN= no
+
+FILES= xorg-server.m4
+FILESDIR= ${X11ROOTDIR}/share/aclocal
+
+.PATH: ${X11SRCDIR.xorg-server}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
+.include <bsd.files.mk>
Home |
Main Index |
Thread Index |
Old Index