[libdvdnav-devel] [PATCH 1/2] build: follow in the path of libdvdcss for building.

[Diego Biurrun]

On Wed, Nov 06, 2013 at 03:20:40PM +0100, Jean-Baptiste Kempf wrote:
> --- a/.gitignore
> +++ b/.gitignore
> @@ -3,6 +3,7 @@
>  *.o
>  *~
>  .deps/
> +.dirstamp
>  .libs/
>  /aclocal.m4
>  /autom4te.cache/
> @@ -17,9 +18,15 @@
>  /install-sh
>  /libtool
>  /ltmain.sh
> +/m4/libtool.m4
> +/m4/lt*.m4
>  /misc/*.pc
>  /misc/libdvdread.spec
>  /missing
>  /stamp-h1
> +ChangeLog
>  Makefile
>  Makefile.in
> +doc/doxygen.cfg
> +doc/html
> +stamp-*

Same as with the other patch, this could be prefixed with /.

> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,8 +1,18 @@
>  AM_CPPFLAGS = -I$(top_srcdir)/src $(CSS_CFLAGS)
>  
> -dist_doc_DATA = AUTHORS ChangeLog COPYING README TODO
> +dist_doc_DATA = AUTHORS ChangeLog COPYING README TODO NEWS

This looks like it was previously in alphabetical order.

> +DISTCLEANFILES = ChangeLog
> +
> +ChangeLog: stamp-changelog
> +
> +stamp-changelog:
> +	-git log > ChangeLog-tmp
> +	test -s ChangeLog-tmp && mv ChangeLog-tmp ChangeLog
> +	-rm -f ChangeLog-tmp
> +	test -e ChangeLog || touch ChangeLog

This will continuously get rebuilt.
See how I changed this in libdvdcss for comparison.

> --- a/configure.ac
> +++ b/configure.ac
> --- /dev/null
> +++ b/doc/doxygen.cfg.in
> @@ -0,0 +1,1332 @@
> +# Doxyfile 1.5.6

That's a rather ancient version.

The file is full of trailing whitespace - do we care?

> --- /dev/null
> +++ b/m4/attributes.m4
> @@ -0,0 +1,296 @@
> +
> +AC_DEFUN([CC_FLAG_VISIBILITY], [
> +  AC_REQUIRE([CC_CHECK_WERROR])
> +  AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
> +    [cc_cv_flag_visibility],
> +    [cc_flag_visibility_save_CFLAGS="$CFLAGS"
> +     CFLAGS="$CFLAGS $cc_cv_werror"
> +     CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
> +	cc_cv_flag_visibility='yes',
> +	cc_cv_flag_visibility='no')
> +     CFLAGS="$cc_flag_visibility_save_CFLAGS"])
> +
> +AC_DEFUN([CC_FUNC_EXPECT], [
> +  AC_REQUIRE([CC_CHECK_WERROR])
> +  AC_CACHE_CHECK([if compiler has __builtin_expect function],
> +    [cc_cv_func_expect],
> +    [ac_save_CFLAGS="$CFLAGS"
> +     CFLAGS="$CFLAGS $cc_cv_werror"
> +     AC_COMPILE_IFELSE(
> +       [int some_function() {
> +        int a = 3;
> +        return (int)__builtin_expect(a, 3);
> +	}],
> +       [cc_cv_func_expect=yes],
> +       [cc_cv_func_expect=no])
> +     CFLAGS="$ac_save_CFLAGS"
> +    ])

Stray tabs in a file otherwise not containing tabs.

Diego