g3dvl: Clean up Makefile deps.

diff --git a/src/driclient/src/Makefile b/src/driclient/src/Makefile
index 5d913ad5fa54e2735c5e67b4a959bd4e3e783c37..34435a2086ecceadf453faec12d51fc505d31bc0 100644 (file)
--- a/src/driclient/src/Makefile
+++ b/src/driclient/src/Makefile
@@ -8,16 +8,12 @@ CFLAGS                += -g -Wall -fPIC -I../include -I${DRMDIR}/include -I${DRMDIR}/include/d
 
 .PHONY = all clean
 
-all: ${TARGET} test
+all: ${TARGET}
 
 ${TARGET}: ${OBJECTS}
        ar rcs $@ $^
        if ! test -d ../lib; then mkdir ../lib; fi
        cp ${TARGET} ../lib
 
-test: test.o
-       $(CC) -L../lib -L${DRMDIR}/lib ${LDFLAGS} -o $@ $^ -ldriclient -lX11 -lXext -ldrm
-
 clean:
-       rm -rf ${OBJECTS} ${TARGET} ../lib/${TARGET} test test.o
-
+       rm -rf ${OBJECTS} ${TARGET} ../lib/${TARGET}

diff --git a/src/driclient/src/test.c b/src/driclient/src/test.c
deleted file mode 100644 (file)
index 15f75d9..0000000
--- a/src/driclient/src/test.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include "driclient.h"
-
-int main(int argc, char **argv)
-{
-       Display         *dpy;
-       Window          root, window;
-       
-       dri_screen_t    *screen;
-       dri_drawable_t  *dri_drawable;
-       dri_context_t   *context;
-       
-       dpy = XOpenDisplay(NULL);
-       root = XDefaultRootWindow(dpy);
-       window = XCreateSimpleWindow(dpy, root, 0, 0, 100, 100, 0, 0, 0);
-
-       XSelectInput(dpy, window, 0);
-       XMapWindow(dpy, window);
-       XSync(dpy, 0);
-       
-       assert(driCreateScreen(dpy, 0, &screen, NULL) == 0);
-       assert(driCreateDrawable(screen, window, &dri_drawable) == 0);
-       assert(driCreateContext(screen, XDefaultVisual(dpy, 0), &context) == 0);
-       assert(driUpdateDrawableInfo(dri_drawable) == 0);
-       
-       DRI_VALIDATE_DRAWABLE_INFO(screen, dri_drawable);
-       
-       assert(drmGetLock(screen->fd, context->drm_context, 0) == 0);
-       assert(drmUnlock(screen->fd, context->drm_context) == 0);
-       
-       assert(driDestroyContext(context) == 0);
-       assert(driDestroyDrawable(dri_drawable) == 0);
-       assert(driDestroyScreen(screen) == 0);
-       
-       XDestroyWindow(dpy, window);
-       XCloseDisplay(dpy);
-       
-       return 0;
-}
-

diff --git a/src/driclient/src/xf86dri.h b/src/driclient/src/xf86dri.h
deleted file mode 100644 (file)
index baf80a7..0000000
--- a/src/driclient/src/xf86dri.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/**
- * \file xf86dri.h
- * Protocol numbers and function prototypes for DRI X protocol.
- *
- * \author Kevin E. Martin <martin@valinux.com>
- * \author Jens Owen <jens@tungstengraphics.com>
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- */
-
-#ifndef _XF86DRI_H_
-#define _XF86DRI_H_
-
-#include <X11/Xfuncproto.h>
-#include <xf86drm.h>
-
-#define X_XF86DRIQueryVersion                  0
-#define X_XF86DRIQueryDirectRenderingCapable   1
-#define X_XF86DRIOpenConnection                        2
-#define X_XF86DRICloseConnection               3
-#define X_XF86DRIGetClientDriverName           4
-#define X_XF86DRICreateContext                 5
-#define X_XF86DRIDestroyContext                        6
-#define X_XF86DRICreateDrawable                        7
-#define X_XF86DRIDestroyDrawable               8
-#define X_XF86DRIGetDrawableInfo               9
-#define X_XF86DRIGetDeviceInfo                 10
-#define X_XF86DRIAuthConnection                 11
-#define X_XF86DRIOpenFullScreen                 12   /* Deprecated */
-#define X_XF86DRICloseFullScreen                13   /* Deprecated */
-
-#define XF86DRINumberEvents            0
-
-#define XF86DRIClientNotLocal          0
-#define XF86DRIOperationNotSupported   1
-#define XF86DRINumberErrors            (XF86DRIOperationNotSupported + 1)
-
-#ifndef _XF86DRI_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XF86DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
-
-Bool XF86DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
-    int *patchVersion );
-
-Bool XF86DRIQueryDirectRenderingCapable( Display *dpy, int screen,
-    Bool *isCapable );
-
-Bool XF86DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
-    char **busIDString );
-
-Bool XF86DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
-
-Bool XF86DRICloseConnection( Display *dpy, int screen );
-
-Bool XF86DRIGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName );
-
-Bool XF86DRICreateContext( Display *dpy, int screen, Visual *visual,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-Bool XF86DRIDestroyContext( Display *dpy, int screen,
-    XID context_id );
-
-Bool XF86DRICreateDrawable( Display *dpy, int screen,
-    Drawable drawable, drm_drawable_t *hHWDrawable );
-
-Bool XF86DRIDestroyDrawable( Display *dpy, int screen, 
-    Drawable drawable);
-
-Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
-    unsigned int *index, unsigned int *stamp, 
-    int *X, int *Y, int *W, int *H,
-    int *numClipRects, drm_clip_rect_t ** pClipRects,
-    int *backX, int *backY,
-    int *numBackClipRects, drm_clip_rect_t **pBackClipRects );
-
-Bool XF86DRIGetDeviceInfo( Display *dpy, int screen,
-    drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
-    int *fbStride, int *devPrivateSize, void **pDevPrivate );
-
-_XFUNCPROTOEND
-
-#endif /* _XF86DRI_SERVER_ */
-
-#endif /* _XF86DRI_H_ */
-

diff --git a/src/gallium/winsys/g3dvl/nouveau/Makefile b/src/gallium/winsys/g3dvl/nouveau/Makefile
index 7fa29d2f5fb844335f47d811c533f6adaad25806..5d11bde322b80768973f98fb378d8e2446584382 100644 (file)
--- a/src/gallium/winsys/g3dvl/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/nouveau/Makefile
@@ -34,15 +34,16 @@ LIBS                += -ldriclient -ldrm -lnv10 -lnv30 -lnv40 -lnv50 -ldraw -ltgsi -ltranslate
 
 #############################################
 
-.PHONY = all clean
+.PHONY = all clean libdriclient
 
 all: ${TARGET}
 
-${TARGET}: ${OBJECTS}
+${TARGET}: ${OBJECTS} libdriclient
+       $(CC) ${LDFLAGS} -shared -o $@ ${OBJECTS} ${LIBS}
+
+libdriclient:
        cd ${DRIDIR}/src; ${MAKE}
-       $(CC) ${LDFLAGS} -shared -o $@ $^ ${LIBS}
 
 clean:
        cd ${DRIDIR}/src; ${MAKE} clean
        rm -rf ${OBJECTS} ${TARGET}
-

diff --git a/src/libXvMC/Makefile b/src/libXvMC/Makefile
index b72bb16efbffc66801506ba566670a9ebdfc49aa..8565d271c70b478adcc5c2e2a98d14136b2e4964 100644 (file)
--- a/src/libXvMC/Makefile
+++ b/src/libXvMC/Makefile
@@ -38,27 +38,36 @@ endif
 
 #############################################
 
-.PHONY = all clean
+ifeq (${DRIVER}, softpipe)
+.PHONY = all clean g3dvl
+else
+.PHONY = all clean g3dvl nouveau_winsys
+endif
 
 all: ${TARGET}
 
 ifeq (${DRIVER}, softpipe)
-${TARGET}: ${OBJECTS}
+${TARGET}: g3dvl
+       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
+
+g3dvl:
        cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
-       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ $^ ${LIBS}
 
 clean:
        cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
        rm -rf ${OBJECTS} ${TARGET}
 else
-${TARGET}: ${OBJECTS}
+${TARGET}: ${OBJECTS} g3dvl nouveau_winsys
+       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
+
+g3dvl:
        cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
+
+nouveau_winsys:
        cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE}
-       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ $^ ${LIBS}
 
 clean:
        cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
        cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE} clean
        rm -rf ${OBJECTS} ${TARGET}
 endif
-