g3dvl: Recursively build dependencies.

Run `make` in src/libXvMC and everything should be built for Nouveau.
Run `make DRIVER=softpipe` in src/libXvMC for SoftPipe.

diff --git a/src/driclient/src/Makefile b/src/driclient/src/Makefile
index 3c0fc284409f2b4f0ffd40fa81379e84ebe70f09..89ffb84477f4f90cc4723a33e971ef44afc47d8f 100644 (file)
--- a/src/driclient/src/Makefile
+++ b/src/driclient/src/Makefile
@@ -19,5 +19,5 @@ test: test.o
        $(CC) -L../lib -L${DRMDIR}/lib ${LDFLAGS} -o $@ $^ -ldriclient -lX11 -lXext -ldrm
 
 clean:
-       rm -rf ${OBJECTS} ${TARGET} test test.o
+       rm -rf ${OBJECTS} ${TARGET} ../lib/${TARGET} test test.o
 

diff --git a/src/gallium/winsys/g3dvl/nouveau/Makefile b/src/gallium/winsys/g3dvl/nouveau/Makefile
index 644ac083e65078cae1dcf5c628efb0e9c3725aff..2861bd7db4fd0ccda3d8823905aea3cce3e551d5 100644 (file)
--- a/src/gallium/winsys/g3dvl/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/nouveau/Makefile
@@ -39,8 +39,10 @@ LIBS         += -ldriclient -ldrm -lnv10 -lnv30 -lnv40 -lnv50 -ldraw -ltgsi -ltranslate
 all: ${TARGET}
 
 ${TARGET}: ${OBJECTS}
+       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 83fcfc523c1b3b869a471634a5e4112a1b94e0f7..c154e17dc353577678f8b430c7d924a3f42d2632 100644 (file)
--- a/src/libXvMC/Makefile
+++ b/src/libXvMC/Makefile
@@ -42,9 +42,23 @@ endif
 
 all: ${TARGET}
 
+ifeq (${DRIVER}, softpipe)
+${TARGET}: ${OBJECTS}
+       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}
+       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
+       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