st/mesa: fix incorrect RowStride computation

[mesa.git] / src / gallium / winsys / g3dvl / nouveau / Makefile

diff --git a/src/gallium/winsys/g3dvl/nouveau/Makefile b/src/gallium/winsys/g3dvl/nouveau/Makefile
index 644ac083e65078cae1dcf5c628efb0e9c3725aff..f07a7926d63cb131db28858240cdaa2147e2787c 100644 (file)
--- a/src/gallium/winsys/g3dvl/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/nouveau/Makefile
@@ -3,44 +3,41 @@ GALLIUMDIR    = ../../..
 DRMDIR         ?= /usr
 DRIDIR         = ../../../../driclient
 
-OBJECTS                = nouveau_bo.o nouveau_fence.o nouveau_swapbuffers.o nouveau_channel.o          \
-                 nouveau_grobj.o nouveau_context.o nouveau_winsys.o nouveau_lock.o             \
-                 nouveau_winsys_pipe.o nouveau_device.o nouveau_notifier.o nouveau_dma.o       \
-                 nouveau_pushbuf.o nouveau_resource.o nouveau_screen.o nv04_surface.o          \
-                 nv50_surface.o #nouveau_winsys_softpipe.o
-
-CFLAGS         += -g -Wall -Werror -fPIC               \
-                  -I${GALLIUMDIR}/include              \
-                  -I${GALLIUMDIR}/winsys/g3dvl         \
-                  -I${DRMDIR}/include                  \
-                  -I${DRMDIR}/include/drm              \
-                  -I${GALLIUMDIR}/drivers              \
-                  -I${GALLIUMDIR}/auxiliary            \
+OBJECTS                = nouveau_screen_vl.o nouveau_context_vl.o nouveau_swapbuffers.o
+
+CFLAGS         += -g -Wall -Werror=implicit-function-declaration -fPIC \
+                  -I${GALLIUMDIR}/include                              \
+                  -I${GALLIUMDIR}/winsys/g3dvl                         \
+                  -I${GALLIUMDIR}/winsys/drm/nouveau                   \
+                  -I${DRMDIR}/include                                  \
+                  -I${DRMDIR}/include/drm                              \
+                  -I${DRMDIR}/include/nouveau                          \
+                  -I${GALLIUMDIR}/drivers                              \
+                  -I${GALLIUMDIR}/auxiliary                            \
                   -I${DRIDIR}/include
 
-LDFLAGS                += -L${DRMDIR}/lib                      \
-                  -L${DRIDIR}/lib                      \
-                  -L${GALLIUMDIR}/auxiliary/draw       \
-                  -L${GALLIUMDIR}/auxiliary/tgsi       \
-                  -L${GALLIUMDIR}/auxiliary/translate  \
-                  -L${GALLIUMDIR}/auxiliary/rtasm      \
-                  -L${GALLIUMDIR}/auxiliary/cso_cache  \
-                  -L${GALLIUMDIR}/drivers/nv10         \
-                  -L${GALLIUMDIR}/drivers/nv30         \
-                  -L${GALLIUMDIR}/drivers/nv40         \
+LDFLAGS                += -L${DRMDIR}/lib                              \
+                  -L${DRIDIR}/lib                              \
+                  -L${GALLIUMDIR}/winsys/drm/nouveau/common    \
+                  -L${GALLIUMDIR}/auxiliary                    \
+                  -L${GALLIUMDIR}/drivers/nv30                 \
+                  -L${GALLIUMDIR}/drivers/nv40                 \
                   -L${GALLIUMDIR}/drivers/nv50
 
-LIBS           += -ldriclient -ldrm -lnv10 -lnv30 -lnv40 -lnv50 -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lm
+LIBS           += -lnouveaudrm -ldriclient -ldrm_nouveau -ldrm -lnv30 -lnv40 -lnv50 -lgallium -lm
 
 #############################################
 
-.PHONY = all clean
+.PHONY = all clean libdriclient
 
 all: ${TARGET}
 
-${TARGET}: ${OBJECTS}
-       $(CC) ${LDFLAGS} -shared -o $@ $^ ${LIBS}
+${TARGET}: ${OBJECTS} libdriclient
+       $(CC) ${LDFLAGS} -shared -o $@ ${OBJECTS} ${LIBS}
+
+libdriclient:
+       cd ${DRIDIR}/src; ${MAKE}
 
 clean:
+       cd ${DRIDIR}/src; ${MAKE} clean
        rm -rf ${OBJECTS} ${TARGET}
-