diff options
| author | Younes Manton <younes.m@gmail.com> | 2008-07-26 16:51:09 -0400 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2008-07-26 16:55:46 -0400 |
| commit | a17e6c046cd990f2ed4d0dfe9ed0a59bccd9aade (patch) | |
| tree | d58f27532f5d9f6cce89b8c72b14f85ecedd211a | |
| parent | 9e445d3e6374c2a9b163f1262ea5a1047e596cae (diff) | |
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.
| -rw-r--r-- | src/driclient/src/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/g3dvl/nouveau/Makefile | 2 | ||||
| -rw-r--r-- | src/libXvMC/Makefile | 14 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/driclient/src/Makefile b/src/driclient/src/Makefile index 3c0fc28440..89ffb84477 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 644ac083e6..2861bd7db4 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 83fcfc523c..c154e17dc3 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 |