Hi,
I'm trying to integrate xdriinfo into the DRI tree. My first idea was to
add it under xc/programs/xdriifno. But none of the subdirs of
xc/programs are compiled except Xserver if BuildServersOnly is set (as
in the default DRI host.def). So I thought
xc/programs/Xserver/hw/xfree86/xdriinfo would be a good place.
I had to change various Imake related files in order to make this work.
A patch against the config-0-0-1-branch is listed below (the line
numbers of host.def are probably wrong as I have more changes in my
host.def). I also appended the new Imakefile for xdriinfo itself. It's
mostly copied from xf86config's Imakefile. I'd appreciate if someone
with more Imake and XFree86 experience could tell me if this is ok
before I commit it to the config-0-0-1-branch.
TIA,
Felix
------------ __\|/__ ___ ___ -------------------------
Felix ___\_e -_/___/ __\___/ __\_____ You can do anything,
Kühling (_____\Ä/____/ /_____/ /________) just not everything
[EMAIL PROTECTED] \___/ \___/ U at the same time.
------------------------------------------------------------------------------
cvs diff -u config/cf/X11.tmpl config/cf/host.def programs/Xserver/hw/xfree86/Imakefile
------------------------------------------------------------------------------
Index: config/cf/X11.tmpl
===================================================================
RCS file: /cvsroot/dri/xc/xc/config/cf/X11.tmpl,v
retrieving revision 1.30
diff -u -r1.30 X11.tmpl
--- config/cf/X11.tmpl 1 Apr 2003 22:52:31 -0000 1.30
+++ config/cf/X11.tmpl 31 May 2003 15:35:13 -0000
@@ -541,6 +541,9 @@
#ifndef BuildGLwLibrary
#define BuildGLwLibrary (BuildGLXLibrary && BuildLibraries)
#endif
+#ifndef BuildXDriInfo
+#define BuildXDriInfo NO
+#endif
#ifndef BuildXF86RushExt
#define BuildXF86RushExt NO
#endif
Index: config/cf/host.def
===================================================================
RCS file: /cvsroot/dri/xc/xc/config/cf/host.def,v
retrieving revision 1.53
diff -u -r1.53 host.def
--- config/cf/host.def 1 Apr 2003 23:41:50 -0000 1.53
+++ config/cf/host.def 31 May 2003 15:35:13 -0000
@@ -88,6 +95,7 @@
#define BuildLibrariesForXServers NO
#define BuildLibrariesForConfigTools NO
#define BuildGLXLibrary YES
+#define BuildXDriInfo YES
#define BuildXInputLib NO
#define BuildXIE NO
#define BuildPexExt NO
Index: programs/Xserver/hw/xfree86/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/Imakefile,v
retrieving revision 1.12
diff -u -r1.12 Imakefile
--- programs/Xserver/hw/xfree86/Imakefile 25 Mar 2003 14:04:50 -0000 1.12
+++ programs/Xserver/hw/xfree86/Imakefile 31 May 2003 15:35:14 -0000
@@ -91,12 +91,16 @@
XF86CFGDIRS = xf86cfg xf86config
#endif
+#if BuildXDriInfo
+XDRIINFO = xdriinfo
+#endif
+
SUBDIRS = os-support common $(I2CDIR) $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
$(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
$(RACDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) $(VBEDIR) parser \
scanpci doc dummylib $(XF86CFGDIRS) $(XF86SETUPDIR) etc \
- $(DRIVERSDK) $(XF8_32WIDDIR)
+ $(DRIVERSDK) $(XF8_32WIDDIR) $(XDRIINFO)
#if !defined(OS2Architecture) && !defined(cygwinArchitecture)
XF86CONFIG = XF86Config
------------------------------------------------------------------------------
xc/programs/Xserver/hw/xfree86/xdriinfo/Imakefile:
------------------------------------------------------------------------------
SRCS = xdriinfo.c
OBJS = xdriinfo.o
LOCAL_LIBRARIES = $(XLIB) $(GLXLIB)
DEPLIBS =
AllTarget(ProgramTargetName(xdriinfo))
NormalProgramTarget(xdriinfo,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
InstallProgram(xdriinfo,$(BINDIR))
DependTarget()
/* InstallManPage(xdriinfo,$(MANDIR)) */
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
