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

[Jack Moffitt]

jack        01/10/21 08:35:14

  Modified:    .        configure.in
               src      Makefile.am
  Log:
  Make lib handling more sane.

Revision  Changes    Path
1.8       +7 -5      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in	2001/10/21 15:14:23	1.7
+++ configure.in	2001/10/21 15:35:14	1.8
@@ -8,6 +8,8 @@
 
 dnl Set some options based on environment
 
+SOCKET_LIBS=
+
 if test -z "$GCC"; then
         case $host in 
         *-*-irix*)
@@ -19,7 +21,7 @@
                 DEBUG="-v -g -D_REENTRANT"
                 CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
-		SUN_LIBS="-lnsl -lsocket -lresolv"
+		SOCKET_LIBS="-lnsl -lsocket -lresolv"
                 ;;
         *)
                 DEBUG="-g -D_REENTRANT"
@@ -38,7 +40,7 @@
                 DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
                 CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
                 PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT" 
-		SUN_LIBS="-lnsl -lsocket -lresolv"
+		SOCKET_LIBS="-lnsl -lsocket -lresolv"
                 ;;
         *)
                 DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
@@ -117,11 +119,11 @@
 
 dnl Make substitutions
 
-LIBS="$LIBS $XML_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SHOUT_LIBS"
-
 AC_SUBST(OSS_CFLAGS)
 AC_SUBST(SUN_CFLAGS)
-AC_SUBST(SUN_LIBS)
+AC_SUBST(SOCKET_LIBS)
+AC_SUBST(XML_LIBS)
+AC_SUBST(SHOUT_LIBS)
 AC_SUBST(LIBTOOL_DEPS)
 AC_SUBST(OPT)
 AC_SUBST(LIBS)

1.3       +3 -1      ices/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/10/02 12:23:51	1.2
+++ Makefile.am	2001/10/21 15:35:14	1.3
@@ -25,7 +25,9 @@
 
 ices_LDADD = net/libicenet.la thread/libicethread.la log/libicelog.la\
         avl/libiceavl.la timing/libicetiming.la
-LIBS = -lpthread $(SUN_LIBS)
+
+LIBS = -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@\
+       @VORBISENC_LIBS@ @SHOUT_LIBS@
 
 INCLUDES = -Inet -Ithread -Iavl -Ilog -Itiming $(OSS_CFLAGS) $(SUN_CFLAGS)
 

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