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

[Ralph Giles]

giles       03/07/04 20:02:09

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  Reenable building the timer liblet now that we won't collide with libshout's version.

Revision  Changes    Path
1.27      +7 -1      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in	2 Jul 2003 20:26:51 -0000	1.26
+++ configure.in	5 Jul 2003 00:02:09 -0000	1.27
@@ -147,4 +147,10 @@
 AC_SUBST(XIPH_CPPFLAGS)
 AC_SUBST(XIPH_LIBS)
 
-AC_OUTPUT(Makefile conf/Makefile src/Makefile src/log/Makefile)
+AC_OUTPUT(
+  Makefile
+  conf/Makefile 
+  src/Makefile 
+   src/log/Makefile 
+   src/timing/Makefile
+)

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

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.am	3 Jul 2003 13:24:37 -0000	1.23
+++ Makefile.am	5 Jul 2003 00:02:09 -0000	1.24
@@ -2,8 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = log
-EXTRA_DIST = thread/thread.h timing/timing.h
+SUBDIRS = log timing
+EXTRA_DIST = thread/thread.h
 
 bin_PROGRAMS = ices
 AM_CPPFLAGS = @XIPH_CPPFLAGS@
@@ -27,7 +27,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 @ALSA_LIBS@ @XIPH_LIBS@
+ices_LDADD = log/libicelog.la timing/libicetiming.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.