[xiph-cvs] cvs commit: ao/src/plugins/sun Makefile.am

Stan Seibert volsung at xiph.org
Tue Nov 20 20:53:16 PST 2001



volsung     01/11/20 20:53:15

  Modified:    doc      Makefile.am
               src      Makefile.am
               src/plugins/alsa Makefile.am
               src/plugins/alsa09 Makefile.am
               src/plugins/arts Makefile.am
               src/plugins/esd Makefile.am
               src/plugins/irix Makefile.am
               src/plugins/macosx Makefile.am
               src/plugins/oss Makefile.am
               src/plugins/sun Makefile.am
  Log:
  Fixes so that building is possible outside the source tree.  Thanks to
  Mike Castle <dalgoda at ix.netcom.com> for noticing the problem.

Revision  Changes    Path
1.7       +37 -1     ao/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/doc/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	2001/08/06 19:01:36	1.6
+++ Makefile.am	2001/11/21 04:53:11	1.7
@@ -4,6 +4,42 @@
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
-doc_DATA = *.html ao_example.c style.css
+# We list all of these as opposed to using a wildcard so that
+# building outside the source directory works.
+doc_DATA =  ao_append_option.html \
+            ao_close.html \
+            ao_default_driver_id.html \
+            ao_device.html \
+            ao_driver_id.html \
+            ao_driver_info.html \
+            ao_driver_info_list.html \
+            ao_file_extension.html \
+            ao_free_options.html \
+            ao_info.html \
+            ao_initialize.html \
+            ao_open_file.html \
+            ao_open_live.html \
+            ao_option.html \
+            ao_play.html \
+            ao_plugin_close.html \
+            ao_plugin_device_clear.html \
+            ao_plugin_device_init.html \
+            ao_plugin_driver_info.html \
+            ao_plugin_file_extension.html \
+            ao_plugin_open.html \
+            ao_plugin_play.html \
+            ao_plugin_set_option.html \
+            ao_plugin_test.html \
+            ao_sample_format.html \
+            ao_shutdown.html \
+            config.html \
+            drivers.html \
+            index.html \
+            libao-api.html \
+            overview.html \
+            plugin-api.html \
+            plugin-overview.html \
+            ao_example.c \
+            style.css
 
 EXTRA_DIST = $(doc_DATA)

1.9       +1 -1      ao/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	2001/08/21 03:34:19	1.8
+++ Makefile.am	2001/11/21 04:53:12	1.9
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = plugins
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -DAO_PLUGIN_PATH=\"@plugindir@\"
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -DAO_PLUGIN_PATH=\"@plugindir@\"
 
 lib_LTLIBRARIES = libao.la
 

1.3       +1 -1      ao/src/plugins/alsa/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2000/11/04 05:29:30	1.2
+++ Makefile.am	2001/11/21 04:53:12	1.3
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(alsaltlibs)

1.2       +1 -1      ao/src/plugins/alsa09/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa09/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2001/08/31 16:10:32	1.1
+++ Makefile.am	2001/11/21 04:53:12	1.2
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(alsa09ltlibs)

1.3       +1 -1      ao/src/plugins/arts/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/arts/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/07/06 00:31:47	1.2
+++ Makefile.am	2001/11/21 04:53:13	1.3
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include @ARTS_CFLAGS@
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(artsltlibs)

1.2       +1 -1      ao/src/plugins/esd/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/esd/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2000/10/30 00:46:42	1.1
+++ Makefile.am	2001/11/21 04:53:13	1.2
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ESD_CFLAGS@
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include @ESD_CFLAGS@
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(esdltlibs)

1.3       +1 -1      ao/src/plugins/irix/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/irix/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/08/04 02:56:17	1.2
+++ Makefile.am	2001/11/21 04:53:13	1.3
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(irixltlibs)

1.3       +1 -1      ao/src/plugins/macosx/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/macosx/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/09/27 00:32:22	1.2
+++ Makefile.am	2001/11/21 04:53:14	1.3
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -framework CoreAudio
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -framework CoreAudio
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(macosxltlibs)

1.2       +1 -1      ao/src/plugins/oss/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/oss/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2000/10/30 00:46:43	1.1
+++ Makefile.am	2001/11/21 04:53:14	1.2
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(ossltlibs)

1.2       +1 -1      ao/src/plugins/sun/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/sun/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2001/05/17 15:28:44	1.1
+++ Makefile.am	2001/11/21 04:53:14	1.2
@@ -16,7 +16,7 @@
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
 
 libdir = $(plugindir)
 lib_LTLIBRARIES = $(sunltlibs)

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list