Miscellany

diff --git a/configure.ac b/configure.acindex f9a483e..7cb7cf6 100644--- a/configure.ac+++ b/configure.ac@@ -1927,7 +1927,7 @@ if test "x$enable_gallium_tests" = xyes; then fi  if test "x$enable_gallium_loader" = xyes; then-    if test "x$have_libdrm$have_libudev" = xyes; then+    if test "x$have_libdrm$have_libudev" = xyesyes; then         GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS loader/drm"     fi     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS loader/sw loader/"diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.cindex 42b11d2..4c2cb5f 100644--- a/src/gallium/drivers/r600/r600_pipe.c+++ b/src/gallium/drivers/r600/r600_pipe.c@@ -363,6 +363,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) 	case PIPE_CAP_PRIMITIVE_RESTART: 	case PIPE_CAP_CONDITIONAL_RENDER: 	case PIPE_CAP_TEXTURE_BARRIER:+	case PIPE_CAP_COMPUTE: 		return 1;  	/* Supported except the original R600. */diff --git a/src/gallium/state_trackers/clover/Makefile b/src/gallium/state_trackers/clover/Makefileindex 1475620..1dd7e23 100644--- a/src/gallium/state_trackers/clover/Makefile+++ b/src/gallium/state_trackers/clover/Makefile@@ -60,6 +60,8 @@ PIPE_INSTALL_DIR = $(OPENCL_LIB_INSTALL_DIR) %.o: %.S 	$(CC) -c $(INCLUDES) $(CFLAGS)  $< -o $@ +$(TOP)/src/gallium/winsys/loader/libws_loader.a:+	$(MAKE) -C $(TOP)/src/gallium/winsys/loader/ ##### TARGETS #####  default: depend $(TARGET)diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefileindex 161baab..c6a8ced 100644--- a/src/gallium/tests/trivial/Makefile+++ b/src/gallium/tests/trivial/Makefile@@ -44,6 +44,8 @@ clean: 	-rm -f *.o 	-rm -f result.bmp +install: ;+ ##### RULES #####  $(OBJECTS): %.o: %.cdiff --git a/src/gallium/winsys/loader/sw/Makefile b/src/gallium/winsys/loader/sw/Makefileindex 9a5d7ca..30958c5 100644--- a/src/gallium/winsys/loader/sw/Makefile+++ b/src/gallium/winsys/loader/sw/Makefile@@ -22,4 +22,7 @@ LIBRARY_DEFINES += -DHAVE_WINSYS_XLIB EXTRA_OBJECTS += $(TOP)/src/gallium/winsys/sw/null/libws_xlib.a endif +$(TOP)/src/gallium/winsys/sw/null/libws_null.a:+	$(MAKE) -C $(TOP)/src/gallium/winsys/sw/null+ include ../../../Makefile.template