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

[Brendan]

brendan     03/03/10 20:50:39

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  various LIBS, CFLAGS cleanups, especially for shout-config

Revision  Changes    Path
1.20      +2 -3      libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in	8 Mar 2003 16:23:58 -0000	1.19
+++ configure.in	11 Mar 2003 01:50:38 -0000	1.20
@@ -111,14 +111,13 @@
 
 XIPH_PATH_OGG
 XIPH_PATH_VORBIS
-LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
 XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
 
 # Build shout-config
 SHOUT_VERSION="$VERSION"
 SHOUT_LIBS="-lshout"
-SHOUT_LIBDEPS="$LIBS"
-SHOUT_CFLAGS="$XIPH_CFLAGS"
+SHOUT_LIBDEPS="$VORBIS_LIBS $OGG_LIBS $PTHREAD_LIBS"
+SHOUT_CFLAGS="$VORBIS_CFLAGS $OGG_CFLAGS $PTHREAD_CFLAGS"
 AC_CONFIG_LIBCONFIG_IN_STATIC
 AC_CONFIG_LIBCONFIG_IN([shout])
 

<p><p>1.10      +1 -1      libshout/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am	9 Mar 2003 22:56:45 -0000	1.9
+++ Makefile.am	11 Mar 2003 01:50:39 -0000	1.10
@@ -18,7 +18,7 @@
 libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
                 httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
 
-INCLUDES = -I$(top_srcdir)/include $(VORBIS_CFLAGS) $(OGG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/include
 
 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.