Remove useless checks for NULL before freeing

[mesa.git] / src / gallium / targets / Makefile.vdpau

diff --git a/src/gallium/targets/Makefile.vdpau b/src/gallium/targets/Makefile.vdpau
index 6b8443fe35c9265a99d524dba6cf53f6326ff966..a00ebf33c50333e59ece4d3ed71109aeaebcec7d 100644 (file)
--- a/src/gallium/targets/Makefile.vdpau
+++ b/src/gallium/targets/Makefile.vdpau
@@ -8,16 +8,27 @@ INCLUDES = -I$(TOP)/src/gallium/include \
           -I$(TOP)/src/gallium/drivers \
           -I$(TOP)/src/gallium/auxiliary \
           -I$(TOP)/src/gallium/winsys \
-          -I$(TOP)/src/gallium/winsys/g3dvl \
           $(DRIVER_INCLUDES)
 DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(DRIVER_DEFINES)
-LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lvdpau -lXext -lX11 -lm
+LIBS = $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt
 STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/vdpau/libvdpautracker.a
 
+ifeq ($(MESA_LLVM),1)
+LDFLAGS += $(LLVM_LDFLAGS)
+DRIVER_EXTRAS = $(LLVM_LIBS)
+LD=$(CXX)
+else
+  ifeq ($(LINK_WITH_CXX),1)
+    LD=$(CXX)
+  else
+    LD=$(CC)
+  endif
+endif
+
 # XXX: Hack, VDPAU public funcs aren't exported if we link to libvdpautracker.a :(
+C_SOURCES += $(TOP)/src/gallium/state_trackers/vdpau/device.c
 OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) \
-         $(TOP)/src/gallium/state_trackers/vdpau/*.o
+         $(ASM_SOURCES:.S=.o)
 
 ##### RULES #####
 
@@ -31,11 +42,11 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 
 default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
 
-$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) $(TOP)/$(LIB_DIR)/gallium Makefile
-       $(MKLIB) -o $(LIBBASENAME) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) Makefile
+       $(MKLIB) -o $(LIBBASENAME) -linker '$(LD)' -ldflags '$(LDFLAGS)' \
                -major $(VDPAU_MAJOR) -minor $(VDPAU_MINOR) $(MKLIB_OPTIONS) \
                -install $(TOP)/$(LIB_DIR)/gallium \
-               $(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS)
+               $(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS) $(DRIVER_EXTRAS)
 
 $(TOP)/$(LIB_DIR)/gallium:
        mkdir -p $@
@@ -52,7 +63,7 @@ tags:
 
 # Remove .o and backup files
 clean:
-       -rm -f *.o *~ *.so $(SYMLINKS)
+       -rm -f $(OBJECTS) *~ *.so $(SYMLINKS)
        -rm -f depend depend.bak
 
 install: default