summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorThomas Balling Sørensen <tball@tball-laptop.(none)>2010-10-26 13:58:19 +0200
committerThomas Balling Sørensen <tball@tball-laptop.(none)>2010-10-26 13:58:19 +0200
commit050dfe9caf364fdaac91db1313988275774a7eaa (patch)
treea8e1b666255419f8aee0ec2be5be458c513b7d01 /src/gallium/targets
parent6ac1bbe21a978e326e6361426343b61d10140aa3 (diff)
vl: fix some build issues after the merge
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/Makefile.xvmc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc
index 08529b38b70..d5d33bde42e 100644
--- a/src/gallium/targets/Makefile.xvmc
+++ b/src/gallium/targets/Makefile.xvmc
@@ -2,6 +2,7 @@
LIBBASENAME = XvMCg3dvl
LIBNAME = lib$(LIBBASENAME).so
+LIB_GLOB=lib$(LIBBASENAME).*so*
XVMC_MAJOR = 1
XVMC_MINOR = 0
INCLUDES = -I$(TOP)/src/gallium/include \
@@ -11,7 +12,7 @@ INCLUDES = -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/winsys/g3dvl \
$(DRIVER_INCLUDES)
DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES)
-LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXvMC -lXv -lX11 -lm
+LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXv -lX11 -lm
STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/xorg/xvmc/libxvmctracker.a
# XXX: Hack, XvMC public funcs aren't exported if we link to libxvmctracker.a :(
@@ -55,8 +56,8 @@ clean:
-rm -f *.o *~ *.so $(SYMLINKS)
-rm -f depend depend.bak
-#install: $(LIBNAME)
-# $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-# $(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+install: default
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(LIB_GLOB) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
include depend