update to libXv 1.0.5

2 files changed, 21 insertions, 10 deletions

diff --git a/lib/libXv/src/Makefile.am b/lib/libXv/src/Makefile.am
index 394233f39..094847433 100644
--- a/lib/libXv/src/Makefile.am
+++ b/lib/libXv/src/Makefile.am
@@ -5,7 +5,8 @@ libXv_la_SOURCES = \
          Xvlibint.h
 
 libXv_la_LIBADD = @XV_LIBS@
-AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+AM_CPPFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS)
 
 libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
@@ -23,6 +24,8 @@ lintlibdir = $(libdir)
 lintlib_DATA = $(LINTLIB)
 
 $(LINTLIB): $(libXau_la_SOURCES)
-	$(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES) 
+	$(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES)
+
+CLEANFILES = $(LINTLIB)
 endif MAKE_LINT_LIB
 
diff --git a/lib/libXv/src/Makefile.in b/lib/libXv/src/Makefile.in
index db24e6dbd..5e24111da 100644
--- a/lib/libXv/src/Makefile.in
+++ b/lib/libXv/src/Makefile.in
@@ -92,8 +92,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -114,6 +116,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -160,15 +163,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
 XV_CFLAGS = @XV_CFLAGS@
 XV_LIBS = @XV_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_NMEDIT = @ac_ct_NMEDIT@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -185,23 +182,31 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -212,13 +217,15 @@ libXv_la_SOURCES = \
          Xvlibint.h
 
 libXv_la_LIBADD = @XV_LIBS@
-AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+AM_CPPFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS)
 libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 @LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS)
 
 @MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir)
 @MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB)
+@MAKE_LINT_LIB_TRUE@CLEANFILES = $(LINTLIB)
 all: all-am
 
 .SUFFIXES:
@@ -437,6 +444,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -515,7 +523,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(libXv_la_SOURCES) $(XV_LIBS)
 
 @MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libXau_la_SOURCES)
-@MAKE_LINT_LIB_TRUE@	$(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES) 
+@MAKE_LINT_LIB_TRUE@	$(LINT) -y -oXv -x $(ALL_LINT_FLAGS) $(libXv_la_SOURCES)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: