diff options
| -rw-r--r-- | CHANGES | 8 | ||||
| -rwxr-xr-x | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | debian/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/ogg/Makefile.am | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/ogg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | win32/Makefile.am | 3 |
10 files changed, 22 insertions, 20 deletions
@@ -1,2 +1,10 @@ +2004-07-05 Thomas Vander Stichele <thomas at apestaart dot org> + + * error out on autotools failures so warnings are caught early on + * clean up AC_OUTPUT + * AUTOMAKE_OPTIONS = foreign only needs to be done toplevel + (this can be verified by checking Makefile's generated in other + directories and seeing that the var isn't used) + - Sat Sep 02 2000 Jack Moffitt <jack@icecast.org> + separated from vorbis @@ -102,15 +102,15 @@ fi echo "Generating configuration files for $package, please wait...." echo " $ACLOCAL $ACLOCAL_FLAGS" -$ACLOCAL $ACLOCAL_FLAGS +$ACLOCAL $ACLOCAL_FLAGS || exit 1 #echo " autoheader" #autoheader echo " $LIBTOOLIZE --automake" -$LIBTOOLIZE --automake +$LIBTOOLIZE --automake || exit 1 echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" -$AUTOMAKE --add-missing $AUTOMAKE_FLAGS +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 echo " autoconf" -autoconf +autoconf || exit 1 cd $olddir $srcdir/configure "$@" && echo diff --git a/configure.in b/configure.in index c4e995e..9bdfe07 100644 --- a/configure.in +++ b/configure.in @@ -288,4 +288,13 @@ AC_SUBST(DEBUG) AC_SUBST(CFLAGS) AC_SUBST(PROFILE) -AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/ogg/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile debian/Makefile ogg.pc) +AC_OUTPUT([ +Makefile +src/Makefile +doc/Makefile doc/ogg/Makefile +include/Makefile include/ogg/Makefile include/ogg/config_types.h +win32/Makefile +debian/Makefile +ogg.pc +ogg-uninstalled.pc +]) diff --git a/debian/Makefile.am b/debian/Makefile.am index 8031e2a..ef373b1 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - EXTRA_DIST = changelog control copyright libogg-dev.docs libogg-dev.install \ libogg0.README.Debian libogg0.install rules diff --git a/doc/Makefile.am b/doc/Makefile.am index 81eae4b..e5ebcf6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,5 @@ ## Process this with automake to create Makefile.in -AUTOMAKE_OPTIONS = foreign - SUBDIRS = ogg docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) diff --git a/doc/ogg/Makefile.am b/doc/ogg/Makefile.am index af12d84..8a51188 100644 --- a/doc/ogg/Makefile.am +++ b/doc/ogg/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\ diff --git a/include/Makefile.am b/include/Makefile.am index 3dc04e7..0084e4d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,3 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - SUBDIRS = ogg diff --git a/include/ogg/Makefile.am b/include/ogg/Makefile.am index 027d134..142699d 100644 --- a/include/ogg/Makefile.am +++ b/include/ogg/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign 1.6 - oggincludedir = $(includedir)/ogg ogginclude_HEADERS = ogg.h os_types.h diff --git a/src/Makefile.am b/src/Makefile.am index c4f40f0..f4f9b8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign 1.6 - INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include lib_LTLIBRARIES = libogg.la diff --git a/win32/Makefile.am b/win32/Makefile.am index 833b28a..bedfcf5 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,8 +1,5 @@ ## Process this with automake to create Makefile.in -AUTOMAKE_OPTIONS = foreign - - EXTRA_DIST = ogg.def ogg_dynamic.dsp ogg_static.dsp\ build_ogg_dynamic.bat build_ogg_dynamic_debug.bat\ build_ogg_static.bat build_ogg_static_debug.bat ogg.dsw |