AuroraMiddleware/ogg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* error out on autotools failures so warnings are caught early on

Browse Source 
* 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)
 


svn path=/trunk/ogg/; revision=6990
This commit is contained in:
Thomas Vander Stichele 2004-07-05 11:13:36 +00:00
parent 6a4b552f30
commit 39ea1f46a1
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -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

8
autogen.sh
View File

@ -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

11
configure.in
View File

@ -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
])

2
debian/Makefile.am vendored
View File

@ -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

2
doc/Makefile.am
View File

@ -1,7 +1,5 @@
## Process this with automake to create Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = ogg
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

2
doc/ogg/Makefile.am
View File

@ -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\

2
include/Makefile.am
View File

@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = ogg

2
include/ogg/Makefile.am
View File

@ -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

2
src/Makefile.am
View File

@ -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

3
win32/Makefile.am
View File

@ -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