Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/x11/Xserver/hw/xfree86 Various xfree86 specific progs.



details:   https://anonhg.NetBSD.org/src/rev/2f0f414c95f8
branches:  trunk
changeset: 556725:2f0f414c95f8
user:      rtr <rtr%NetBSD.org@localhost>
date:      Fri Dec 26 05:23:15 2003 +0000

description:
Various xfree86 specific progs.

diffstat:

 x11/Xserver/hw/xfree86/Makefile                |  13 ++--
 x11/Xserver/hw/xfree86/bin/gtf/Makefile        |  25 ++++++++
 x11/Xserver/hw/xfree86/bin/ioport/Makefile     |  37 +++++++++++++
 x11/Xserver/hw/xfree86/bin/kbd_mode/Makefile   |  28 +++++++++
 x11/Xserver/hw/xfree86/bin/mmapr/Makefile      |  23 ++++++++
 x11/Xserver/hw/xfree86/bin/mmapw/Makefile      |  23 ++++++++
 x11/Xserver/hw/xfree86/bin/pcitweak/Makefile   |  34 +++++++++++
 x11/Xserver/hw/xfree86/bin/scanpci/Makefile    |  36 ++++++++++++
 x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile    |  74 ++++++++++++++++++++++++++
 x11/Xserver/hw/xfree86/bin/xf86config/Makefile |  25 ++++++++
 10 files changed, 312 insertions(+), 6 deletions(-)

diffs (truncated from 361 to 300 lines):

diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/Makefile
--- a/x11/Xserver/hw/xfree86/Makefile   Fri Dec 26 04:53:24 2003 +0000
+++ b/x11/Xserver/hw/xfree86/Makefile   Fri Dec 26 05:23:15 2003 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.2 2003/12/23 10:46:27 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2003/12/26 05:23:15 rtr Exp $
+
+XTODO= rac shadowfb vgahw xf24_32bpp xf1bpp xf4bpp xf8_16bpp xf8_32bpp
 
-XTODO= xloader scanpci dummylib parser rac scanpci shadowfb vgahw \
-       xf24_32bpp xf1bpp xf4bpp xf8_16bpp xf8_32bpp
-
-SUBDIR=        xf86 xf86config loader xf86_os pcidata vgahw ddc i2c vbe xaa \
-       int10 ramdac drivers input
+SUBDIR=        xf86 xf86config loader xf86_os pcidata scanpci vgahw ddc i2c vbe \
+       xaa int10 ramdac xloader dummy input drivers \
+       .WAIT \
+       bin
 
 .include <bsd.subdir.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/gtf/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/gtf/Makefile   Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,25 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  gtf     
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  gtf.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+LDADD= -lm
+DPADD= ${LIBM}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/ioport/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/ioport/Makefile        Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,37 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  ioport
+MKMAN= no
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  ioport.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+XF86OSOBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86_os && ${PRINTOBJDIR}
+DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/dummy && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+LDADD= -L${XF86OSOBJDIR} -lxf86_os \
+       -L${DUMMYOBJDIR} -ldummy \
+       -li386 -lm
+
+DPADD= ${LIBXF86_OS} ${LIBDUMMY} ${LIBI386} ${LIBM}
+
+SYMLINKS=      ${X11BINDIR}/ioport ${X11BINDIR}/inw \
+               ${X11BINDIR}/ioport ${X11BINDIR}/inl \
+               ${X11BINDIR}/ioport ${X11BINDIR}/outb \
+               ${X11BINDIR}/ioport ${X11BINDIR}/outw \
+               ${X11BINDIR}/ioport ${X11BINDIR}/outl
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/kbd_mode/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/kbd_mode/Makefile      Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,28 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  kbd_mode
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  kbd_mode.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+CPPFLAGS+=     -DWSCONS_SUPPORT
+
+.if ${MACHINE} == "i386"
+CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/mmapr/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/mmapr/Makefile Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,23 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  mmapr
+MKMAN= no
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  mmapr.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/mmapw/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/mmapw/Makefile Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,23 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  mmapw
+MKMAN= no
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  mmapw.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/pcitweak/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/pcitweak/Makefile      Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,34 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  pcitweak
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  pcitweak.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+XF86OSOBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86_os && ${PRINTOBJDIR}
+DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/dummy && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+LDADD= -L${XF86OSOBJDIR} -lxf86_os \
+       -L${DUMMYOBJDIR} -ldummy
+
+DPADD= ${LIBXF86_OS} ${LIBDUMMY}
+
+.if ${MACHINE} == "i386"
+LDADD+=        -li386
+DPADD+=        ${LIBI386}
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/scanpci/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/scanpci/Makefile       Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,36 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  scanpci
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
+
+SRCS=  scanpci.c
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+XF86OSOBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86_os && ${PRINTOBJDIR}
+SCANPCIOBJDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/scanpci && ${PRINTOBJDIR}
+DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/dummy && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/dummylib \
+               -I${XSERVERINCDIR}
+
+LDADD= -L${XF86OSOBJDIR} -lxf86_os \
+       -L${SCANPCIOBJDIR} -lscanpci \
+       -L${DUMMYOBJDIR} -ldummy
+
+DPADD= ${LIBXF86_OS} ${LIBSCANPCI} ${LIBDUMMY}
+
+.if ${MACHINE} == "i386"
+CPPFLAGS+=     -DUSE_I386_IOPL
+LDADD+=                -li386
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r d14ecc49354c -r 2f0f414c95f8 x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile       Fri Dec 26 05:23:15 2003 +0000
@@ -0,0 +1,74 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/26 05:23:15 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=  xf86cfg
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86cfg
+
+# XXX only if loadable LDSRCS  = libc_wrapper.c loader.c loadmod.c
+SRCS=  accessx.c card-cfg.c cards.c config.c expert.c help.c interface.c \
+       keyboard-cfg.c libc_wrapper.c loader.c loadmod.c monitor-cfg.c \
+       mouse-cfg.c options.c screen-cfg.c screen.c startx.c stubs.c \
+       vidmode.c xf86config.c xf86PciIds.h
+
+XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+SCANPCIINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/bin/xf86cfg && ${PRINTOBJDIR}
+XF86OBJDIR!=   cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86config && ${PRINTOBJDIR}
+XLOADEROBJDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xloader && ${PRINTOBJDIR}
+DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/dummy && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/lib/font/include \
+               -I${SCANPCIINCDIR} \
+               -I${XSERVERINCDIR}
+
+# XXX only if loadable -DUSE_MODULES
+CPPFLAGS+=     -DXF86CONFIG=\"XF86Config\" -DUSE_MODULES \
+               -DPROJECT_ROOT=\"/usr/X11R6\" \
+               -DXF86CONFIGDIR=\"/etc/X11\" -DWSCONS_SUPPORT
+
+.if ${MACHINE} == "i386"
+CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
+.endif
+               
+
+LDADD= -lxkbui -lxkbfile -L${XF86OBJDIR} -lxf86config -lXxf86misc \
+       -lXxf86vm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lXt -lSM \



Home | Main Index | Thread Index | Old Index