[xiph-cvs] cvs commit: ices/src Makefile.am

[Ralph Giles]

giles       03/07/07 20:30:51

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  Don't require a threaded libshout and instead build our own.
  
  Unfortunately the local build has local dependencies (avl) so this doesn't entirely return us to a working compile.

Revision  Changes    Path
1.28      +1 -3      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure.in	5 Jul 2003 00:02:09 -0000	1.27
+++ configure.in	8 Jul 2003 00:30:50 -0000	1.28
@@ -124,9 +124,6 @@
 XIPH_VAR_PREPEND([XIPH_LIBS], [$XML_LIBS])
 
 XIPH_PATH_SHOUT(, AC_MSG_ERROR([must have libshout installed!]))
-if test "$SHOUT_THREADED" = "no"; then
-    AC_MSG_ERROR([libshout found does not have thread support])
-fi
 XIPH_VAR_APPEND([XIPH_CPPFLAGS], [$SHOUT_CPPFLAGS])
 XIPH_VAR_APPEND([XIPH_CFLAGS], [$SHOUT_CFLAGS])
 XIPH_VAR_PREPEND([XIPH_LIBS], [$SHOUT_LIBS])
@@ -153,4 +150,5 @@
   src/Makefile 
    src/log/Makefile 
    src/timing/Makefile
+   src/thread/Makefile
 )

<p><p>1.26      +2 -3      ices/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.am	6 Jul 2003 13:11:53 -0000	1.25
+++ Makefile.am	8 Jul 2003 00:30:51 -0000	1.26
@@ -2,8 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6
 
-SUBDIRS = log timing
-EXTRA_DIST = thread/thread.h
+SUBDIRS = log timing thread
 
 bin_PROGRAMS = ices
 AM_CPPFLAGS = @XIPH_CPPFLAGS@
@@ -27,7 +26,7 @@
 
 ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa)
 
-ices_LDADD = log/libicelog.la timing/libicetiming.la @ALSA_LIBS@ @XIPH_LIBS@
+ices_LDADD = log/libicelog.la timing/libicetiming.la thread/libicethread.la @ALSA_LIBS@ @XIPH_LIBS@
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

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