[xiph-commits] r3594 - in liboggz/trunk/src: examples liboggz tests tools tools/oggz-chop

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-05-05 01:07:05 -0700 (Mon, 05 May 2008)
New Revision: 3594

Modified:
   liboggz/trunk/src/examples/Makefile.am
   liboggz/trunk/src/liboggz/Makefile.am
   liboggz/trunk/src/tests/Makefile.am
   liboggz/trunk/src/tools/Makefile.am
   liboggz/trunk/src/tools/oggz-chop/Makefile.am
Log:
use -I$(top_builddir) instead of -I$(top_srcdir) throughout, to include the
autogenerated config.h in out-of-tree builds


Modified: liboggz/trunk/src/examples/Makefile.am
===================================================================
--- liboggz/trunk/src/examples/Makefile.am	2008-05-05 07:09:46 UTC (rev 3593)
+++ liboggz/trunk/src/examples/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
+           -I$(top_srcdir)/include \
+           @OGG_CFLAGS@
 
 OGGZDIR = ../liboggz
 OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@

Modified: liboggz/trunk/src/liboggz/Makefile.am
===================================================================
--- liboggz/trunk/src/liboggz/Makefile.am	2008-05-05 07:09:46 UTC (rev 3593)
+++ liboggz/trunk/src/liboggz/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
@@ -1,6 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = $(INCLTDL) -I$(top_srcdir)/include -I$(top_builddir)/include @OGG_CFLAGS@
+INCLUDES = $(INCLTDL) \
+           -I$(top_builddir) -I$(top_builddir)/include \
+           -I$(top_srcdir)/include \
+           @OGG_CFLAGS@
 
 EXTRA_DIST = Version_script.in
 

Modified: liboggz/trunk/src/tests/Makefile.am
===================================================================
--- liboggz/trunk/src/tests/Makefile.am	2008-05-05 07:09:46 UTC (rev 3593)
+++ liboggz/trunk/src/tests/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
+           -I$(top_srcdir)/include \
+           @OGG_CFLAGS@
 
 OGGZDIR = ../liboggz
 OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@

Modified: liboggz/trunk/src/tools/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/Makefile.am	2008-05-05 07:09:46 UTC (rev 3593)
+++ liboggz/trunk/src/tools/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
@@ -6,7 +6,9 @@
 
 bin_SCRIPTS = oggzdiff
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
+           -I$(top_srcdir)/include \
+           @OGG_CFLAGS@
 
 OGGZDIR = ../liboggz
 OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@

Modified: liboggz/trunk/src/tools/oggz-chop/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/Makefile.am	2008-05-05 07:09:46 UTC (rev 3593)
+++ liboggz/trunk/src/tools/oggz-chop/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include \
-           -I$(top_srcdir)/src/tests @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
+           -I$(top_srcdir)/include -I$(top_srcdir)/src/tests \
+           @OGG_CFLAGS@
 
 OGGZDIR = ../../liboggz
 OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@