gallium/targets: don't leave an empty target directory(ies)

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

diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index f9fb56069a9e3dc0fac0f0ae8ec08c1e20855e29..a0f310bc5967423ac822dd7e1576658f072f570b 100644 (file)
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -47,7 +47,7 @@ EXTRA_DIST = \
 
 TARGET_DRIVERS =
 TARGET_CPPFLAGS =
-TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
+TARGET_LIB_DEPS =
 
 include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
 
@@ -59,7 +59,10 @@ if HAVE_GALLIUM_STATIC_TARGETS
 
 libvdpau_gallium_la_SOURCES += target.c
 libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-libvdpau_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
+libvdpau_gallium_la_LIBADD += \
+       $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
+       $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+       $(TARGET_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS
@@ -69,7 +72,7 @@ libvdpau_gallium_la_LIBADD += \
 
 endif # HAVE_GALLIUM_STATIC_TARGETS
 
-if HAVE_MESA_LLVM
+if HAVE_GALLIUM_LLVM
 libvdpau_gallium_la_LIBADD += $(LLVM_LIBS)
 libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
 endif
@@ -105,6 +108,7 @@ endif
 install-data-hook:
        $(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir);                     \
        for i in $(TARGET_DRIVERS); do                                  \
+               has_drivers=1;                                          \
                j=libvdpau_gallium.$(LIB_EXT);                          \
                k=libvdpau_$${i}.$(LIB_EXT);                            \
                l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;                \
@@ -117,7 +121,8 @@ install-data-hook:
                ln -sf $${l}                                            \
                       $${dest_dir}/$${k};                              \
        done;                                                           \
-       $(RM) $${dest_dir}/libvdpau_gallium.*
+       $(RM) $${dest_dir}/libvdpau_gallium.*;                          \
+       test $${has_drivers} -eq 1 || $(RM) -d $${dest_dir}
 
 uninstall-hook:
        for i in $(TARGET_DRIVERS); do                                  \