From: Younes Manton <younes.m@gmail.com>
Date: Sat, 26 Jul 2008 20:51:09 +0000 (-0400)
Subject: g3dvl: Recursively build dependencies.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a17e6c046cd990f2ed4d0dfe9ed0a59bccd9aade;p=mesa.git

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 3c0fc284409..89ffb84477f 100644
--- 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 644ac083e65..2861bd7db4f 100644
--- 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 83fcfc523c1..c154e17dc35 100644
--- 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