[xiph-commits] r6990 - in trunk/ogg: . debian doc doc/ogg include
thomasvs at dactyl.lonelymoon.com
thomasvs
Mon Jul 5 04:13:37 PDT 2004
include/ogg src win32
Message-ID: <20040705111337.75A519AAAB at dactyl.lonelymoon.com>
Author: thomasvs
Date: Mon Jul 5 04:13:37 2004
New Revision: 6990
Modified:
trunk/ogg/CHANGES
trunk/ogg/autogen.sh
trunk/ogg/configure.in
trunk/ogg/debian/Makefile.am
trunk/ogg/doc/Makefile.am
trunk/ogg/doc/ogg/Makefile.am
trunk/ogg/include/Makefile.am
trunk/ogg/include/ogg/Makefile.am
trunk/ogg/src/Makefile.am
trunk/ogg/win32/Makefile.am
Log:
* 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)
Modified: trunk/ogg/CHANGES
===================================================================
--- trunk/ogg/CHANGES 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/CHANGES 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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 at icecast.org>
+ separated from vorbis
Modified: trunk/ogg/autogen.sh
===================================================================
--- trunk/ogg/autogen.sh 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/autogen.sh 2004-07-05 11:13:36 UTC (rev 6990)
@@ -102,15 +102,15 @@
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
Modified: trunk/ogg/configure.in
===================================================================
--- trunk/ogg/configure.in 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/configure.in 2004-07-05 11:13:36 UTC (rev 6990)
@@ -288,4 +288,13 @@
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
+])
Modified: trunk/ogg/debian/Makefile.am
===================================================================
--- trunk/ogg/debian/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/debian/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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
Modified: trunk/ogg/doc/Makefile.am
===================================================================
--- trunk/ogg/doc/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/doc/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -1,7 +1,5 @@
## Process this with automake to create Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = ogg
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
Modified: trunk/ogg/doc/ogg/Makefile.am
===================================================================
--- trunk/ogg/doc/ogg/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/doc/ogg/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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\
Modified: trunk/ogg/include/Makefile.am
===================================================================
--- trunk/ogg/include/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/include/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = ogg
Modified: trunk/ogg/include/ogg/Makefile.am
===================================================================
--- trunk/ogg/include/ogg/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/include/ogg/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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
Modified: trunk/ogg/src/Makefile.am
===================================================================
--- trunk/ogg/src/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/src/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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
Modified: trunk/ogg/win32/Makefile.am
===================================================================
--- trunk/ogg/win32/Makefile.am 2004-07-05 10:47:14 UTC (rev 6989)
+++ trunk/ogg/win32/Makefile.am 2004-07-05 11:13:36 UTC (rev 6990)
@@ -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
More information about the commits
mailing list