diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | include/.gitignore | 2 | ||||
| -rw-r--r-- | include/X11/.gitignore | 2 | ||||
| -rw-r--r-- | include/X11/extensions/.gitignore | 2 | ||||
| -rw-r--r-- | include/X11/extensions/Xvlib.h | 5 | ||||
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | src/.gitignore | 6 |
9 files changed, 18 insertions, 25 deletions
@@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in aclocal.m4 @@ -19,3 +21,10 @@ mkinstalldirs stamp-h1 xv.pc *~ +*.3 +*.o +*.la +*.lo +libXv-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 53e22c6..ee77ced 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,12 +24,12 @@ SUBDIRS = src man include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xv.pc -EXTRA_DIST = xv.pc.in autogen.sh +EXTRA_DIST = xv.pc.in ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 293b81b..b463825 100644 --- a/configure.ac +++ b/configure.ac @@ -29,23 +29,25 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto) - +XV_CFLAGS="$CWARNFLAGS $XV_CFLAGS" AC_SUBST(XV_CFLAGS) AC_SUBST(XV_LIBS) XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/include/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/include/X11/.gitignore b/include/X11/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/include/X11/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/include/X11/extensions/.gitignore b/include/X11/extensions/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/include/X11/extensions/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h index 2fd26e5..b5474aa 100644 --- a/include/X11/extensions/Xvlib.h +++ b/include/X11/extensions/Xvlib.h @@ -55,6 +55,7 @@ SOFTWARE. #include <X11/Xfuncproto.h> #include <X11/extensions/Xv.h> +#include <X11/extensions/XShm.h> typedef struct { int numerator; @@ -366,8 +367,6 @@ extern int XvShmPutImage ( Bool send_event ); -#ifdef _XSHM_H_ - extern XvImage * XvShmCreateImage ( Display *display, XvPortID port, @@ -378,8 +377,6 @@ extern XvImage * XvShmCreateImage ( XShmSegmentInfo *shminfo ); -#endif - _XFUNCPROTOEND diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index c9ae0f3..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.in -Makefile -*.3* diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 9730646..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo |