gallium/tests/trivial: Switch to the pipe loader.

[mesa.git] / src / gallium / tests / trivial / Makefile

diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefile
index 4ddbb0b73dcbede4d7242b7b157f692f61f28dc0..bfe186b1607ac94d4e0d1f091afb03a503b5dbe1 100644 (file)
--- a/src/gallium/tests/trivial/Makefile
+++ b/src/gallium/tests/trivial/Makefile
@@ -11,19 +11,10 @@ INCLUDES = \
        -I$(TOP)/src/gallium/winsys \
        $(PROG_INCLUDES)
 
-ifeq ($(MESA_LLVM),1)
-LINKS = $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
-LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
 LINKS += \
-       $(TOP)/src/gallium/drivers/rbug/librbug.a \
-       $(TOP)/src/gallium/drivers/trace/libtrace.a \
-       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
-       $(TOP)/src/gallium/winsys/sw/null/libws_null.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+       $(GALLIUM_PIPE_LOADER_LIBS) \
        $(GALLIUM_AUXILIARIES) \
-       $(PROG_LINKS)
+       $(PROG_LINKS) $(LIBUDEV_LIBS)
 
 SOURCES = \
        tri.c \
@@ -33,17 +24,25 @@ OBJECTS = $(SOURCES:.c=.o)
 
 PROGS = $(OBJECTS:.o=)
 
-PROG_DEFINES = \
-       -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD
+PROG_DEFINES = -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)\" \
+               $(GALLIUM_PIPE_LOADER_DEFINES)
+
+PIPE_SRC_DIR = $(TOP)/src/gallium/targets/pipe-loader
 
 ##### TARGETS #####
 
-default: $(PROGS)
+default: $(PROGS) pipes
+
+install:
 
 clean:
        -rm -f $(PROGS)
        -rm -f *.o
        -rm -f result.bmp
+       @$(MAKE) -C $(PIPE_SRC_DIR) clean
+
+pipes:
+       @$(MAKE) -C $(PIPE_SRC_DIR)
 
 ##### RULES #####