[xiph-commits] r6818 - in trunk/theora: . debian doc doc/python

[giles at dactyl.lonelymoon.com]

examples include include/theora lib
Message-ID: <20040625200811.B7D1B9AAAB at dactyl.lonelymoon.com>

Author: giles
Date: Fri Jun 25 13:08:11 2004
New Revision: 6818

Modified:
trunk/theora/configure.ac
trunk/theora/debian/Makefile.am
trunk/theora/doc/Makefile.am
trunk/theora/doc/python/Makefile.am
trunk/theora/examples/Makefile.am
trunk/theora/include/Makefile.am
trunk/theora/include/theora/Makefile.am
trunk/theora/lib/Makefile.am
Log:
Autotools build patch from Thomas van der Stichele.

* 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)
* Don't override includedir as a var to install headers, especially not by
using prefix to hack around it.  Use theoraincludedir instead.
* Move around a few directives in configure.ac so the order is correct
and automake doesn't complain anymore.
* Replace AC_CONFIG_HEADERS with older AM_CONFIG_HEADER



Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/configure.ac	2004-06-07 19:45:55 UTC (rev 6818)
@@ -5,7 +5,11 @@
dnl ------------------------------------------------

AC_INIT(libtheora,[unreleased])
-AC_CONFIG_HEADERS([config.h])
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([lib/dct.c])
AM_INIT_AUTOMAKE

@@ -38,9 +42,6 @@
dnl Set build flags based on environment
dnl --------------------------------------------------

-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
dnl Set some target options

cflags_save="$CFLAGS"

Modified: trunk/theora/debian/Makefile.am
===================================================================
--- trunk/theora/debian/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/debian/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,6 +1,4 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
EXTRA_DIST = changelog control copyright rules \
libtheora-dev.install libtheora0.install

Modified: trunk/theora/doc/Makefile.am
===================================================================
--- trunk/theora/doc/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/doc/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = python

docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

Modified: trunk/theora/doc/python/Makefile.am
===================================================================
--- trunk/theora/doc/python/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/doc/python/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

built_docs = spec.py spec.html

Modified: trunk/theora/examples/Makefile.am
===================================================================
--- trunk/theora/examples/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/examples/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
INCLUDES = -I$(top_srcdir)/include

noinst_PROGRAMS = encoder_example dump_video $(BUILDABLE_EXAMPLES)

Modified: trunk/theora/include/Makefile.am
===================================================================
--- trunk/theora/include/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/include/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = theora

Modified: trunk/theora/include/theora/Makefile.am
===================================================================
--- trunk/theora/include/theora/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/include/theora/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,8 +1,6 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
+theoraincludedir = $(includedir)/theora

-includedir = $(prefix)/include/theora
-
include_HEADERS = theora.h


Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am	2004-06-07 02:22:05 UTC (rev 6817)
+++ trunk/theora/lib/Makefile.am	2004-06-07 19:45:55 UTC (rev 6818)
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
INCLUDES = -I$(top_srcdir)/include

lib_LTLIBRARIES = libtheora.la