[xiph-cvs] cvs commit: ao/src Makefile.am ao_alsa.c ao_oss.c ao_wav.c audio_out.c

[Kenneth C. Arnold]

kcarnold    00/09/29 18:16:15

  Modified:    include/ao ao.h
               src      Makefile.am ao_alsa.c ao_oss.c ao_wav.c audio_out.c
  Log:
  Trying to get libao to compile properly. This is at least an improvement.
  See post on mailing list for more info.

Revision  Changes    Path
1.3       +2 -0      ao/include/ao/ao.h

Index: ao.h
===================================================================
RCS file: /usr/local/cvsroot/ao/include/ao/ao.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao.h	2000/09/27 06:11:54	1.2
+++ ao.h	2000/09/30 01:16:14	1.3
@@ -26,6 +26,8 @@
 
 #include <stdlib.h>
 
+#include "os_types.h"
+
 // Type sizes
 #include "config.h"
 

1.3       +6 -2      ao/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2000/09/26 19:00:25	1.2
+++ Makefile.am	2000/09/30 01:16:14	1.3
@@ -2,12 +2,16 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libao.la
 
-libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+#libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+libao_la_SOURCES = audio_out.c ao_oss.c ao_wav.c ao_null.c
 libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+
+EXTRA_libao_la_SOURCES = ao_alsa.c ao_irix.c ao_oss.c ao_wav.c ao_esd.c ao_null.c ao_solaris.c audio_out.c
+
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

1.3       +1 -1      ao/src/ao_alsa.c

Index: ao_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/ao_alsa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao_alsa.c	2000/09/27 06:11:54	1.2
+++ ao_alsa.c	2000/09/30 01:16:15	1.3
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <sys/asoundlib.h>
-#include "audio_out.h"
+#include <ao/ao.h>
 
 #define AO_ALSA_BUF_SIZE 32768
 

1.3       +1 -1      ao/src/ao_oss.c

Index: ao_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/ao_oss.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao_oss.c	2000/09/27 06:11:54	1.2
+++ ao_oss.c	2000/09/30 01:16:15	1.3
@@ -39,7 +39,7 @@
 #endif
 #include <sys/ioctl.h>
 
-#include "audio_out.h"
+#include <ao/ao.h>
 
 static ao_info_t ao_oss_info =
 {

1.3       +1 -1      ao/src/ao_wav.c

Index: ao_wav.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/ao_wav.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao_wav.c	2000/09/27 06:11:55	1.2
+++ ao_wav.c	2000/09/30 01:16:15	1.3
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#include "audio_out.h"
+#include <ao/ao.h>
 
 #define WAVE_FORMAT_PCM  0x0001
 #define FORMAT_MULAW     0x0101

1.3       +1 -1      ao/src/audio_out.c

Index: audio_out.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/audio_out.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio_out.c	2000/09/27 06:11:55	1.2
+++ audio_out.c	2000/09/30 01:16:15	1.3
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "audio_out.h"
+#include <ao/ao.h>
 
 /* --- Function Tables --- */
 

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