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

[Brendan]

brendan     03/03/13 15:32:55

  Modified:    .        configure.ac
               src      Makefile.am
               src/playlist Makefile.am
  Log:
  Automake 1.6 appears to finally handle conditional code dependencies properly.
  Updated accordingly. And, yay!

Revision  Changes    Path
1.4       +6 -8      ices/configure.ac

Index: configure.ac
===================================================================
RCS file: /cvs/ice/ices/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.ac	8 Mar 2003 23:55:58 -0000	1.3
+++ configure.ac	13 Mar 2003 20:32:55 -0000	1.4
@@ -1,5 +1,5 @@
 # configure script for ices
-# $Id: configure.ac,v 1.3 2003/03/08 23:55:58 brendan Exp $
+# $Id: configure.ac,v 1.4 2003/03/13 20:32:55 brendan Exp $
 
 m4_define(ICES_MAJOR, 0)
 m4_define(ICES_MINOR, 2)
@@ -170,12 +170,12 @@
     AC_DEFINE(HAVE_LIBXML, 1, [Define if you have the GNOME XML library])
     LIBS="$LIBS `$XMLCONFIG --libs`"
     CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`"
-    ICES_OBJECTS="$ICES_OBJECTS ices_config.o"
     have_xml="yes"
   else
     AC_MSG_RESULT([Compiling without libxml support - no configfiles])
   fi
 fi
+AM_CONDITIONAL(USE_XML, test "$have_xml" = "yes")
 
 AC_ARG_WITH([python],
   [[  --with-python[=PATH]    include python scripting support]],
@@ -192,10 +192,10 @@
     CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
     LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS"
     LIBS="$LIBS $PYTHON_LIBS"
-    PLAYLIST_OBJECTS="$PLAYLIST_OBJECTS pm_python.o"
     AC_DEFINE(HAVE_LIBPYTHON, 1, [Define if you have the python library])
   fi
 fi
+AM_CONDITIONAL(USE_PYTHON, test "$have_python" = "yes")
 
 if test "$with_python" != "no" -a "$have_python" != "yes"
 then
@@ -235,13 +235,13 @@
   if test "$ac_cv_func_perl_construct" != "no"
   then
     have_perl="yes"
-    PLAYLIST_OBJECTS="$PLAYLIST_OBJECTS pm_perl.o"
     AC_DEFINE(HAVE_LIBPERL, 1, [Define if you have perl libraries])
   else
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
   fi
 fi
+AM_CONDITIONAL(USE_PERL, test "$have_perl" = "yes")
 
 if test "$with_perl" != "no" -a "$have_perl" != "yes"
 then
@@ -277,12 +277,12 @@
     AC_CHECK_LIB(mp3lame, lame_encode_flush_nogap, [
       have_LAME="yes"
       LIBS="$LIBS -lmp3lame"
-      ICES_OBJECTS="$ICES_OBJECTS reencode.o"
       LIBM="-lm"
       AC_DEFINE(HAVE_LIBLAME, 1, [Define if you have the LAME MP3 library])
       ], [have_LAME="no"], -lm)
   fi
 fi
+AM_CONDITIONAL(USE_LAME, test "$have_LAME" = "yes")
 
 if test "$with_lame" != "no" -a "$have_LAME" != "yes"
 then
@@ -322,13 +322,13 @@
   if test "$have_vorbis" != "no"
   then
     AC_CHECK_LIB(vorbisfile, ov_open, [
-      ICES_OBJECTS="$ICES_OBJECTS in_vorbis.o"
       LIBS="$LIBS -lvorbisfile -lvorbis -logg"
       AC_DEFINE(HAVE_LIBVORBISFILE, 1, [Define if you have libvorbisfile])
       have_vorbis="yes"
     ],[have_vorbis="no"],-lvorbis -logg)
   fi
 fi
+AM_CONDITIONAL(USE_VORBIS, test "$have_vorbis" = "yes")
 
 if test "$with_vorbis" != "no" -a "$have_vorbis" != "yes"
 then
@@ -343,8 +343,6 @@
 dnl -- and finish up --
 
 LIBS="$LIBS $LIBM $LIBDL"
-AC_SUBST(ICES_OBJECTS)
-AC_SUBST(PLAYLIST_OBJECTS)
 
 AC_OUTPUT
 

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

Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am	11 Mar 2003 08:11:02 -0000	1.26
+++ Makefile.am	13 Mar 2003 20:32:55 -0000	1.27
@@ -13,10 +13,18 @@
 ices_SOURCES = ices.c log.c setup.c stream.c util.c mp3.c cue.c metadata.c \
         id3.c signals.c
 
-EXTRA_ices_SOURCES = ices_config.c in_vorbis.c reencode.c
+if USE_XML
+ices_SOURCES += ices_config.c
+endif
 
-BUILT_SOURCES = $(ICES_OBJECTS)
+if USE_LAME
+ices_SOURCES += reencode.c
+endif
 
-ices_LDADD = $(ICES_OBJECTS) playlist/libplaylist.a
+if USE_VORBIS
+ices_SOURCES += in_vorbis.c
+endif
+
+ices_LDADD = playlist/libplaylist.a
 
 AM_CPPFLAGS = -DICES_ETCDIR=\"$(sysconfdir)\" -DICES_MODULEDIR=\"$(moddir)\"

<p><p>1.5       +6 -2      ices/src/playlist/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/playlist/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	8 Mar 2003 23:55:58 -0000	1.4
+++ Makefile.am	13 Mar 2003 20:32:55 -0000	1.5
@@ -9,8 +9,12 @@
 
 libplaylist_a_SOURCES = playlist.c pm_builtin.c rand.c
 
-libplaylist_a_LIBADD = @PLAYLIST_OBJECTS@
+if USE_PYTHON
+libplaylist_a_SOURCES += pm_python.c
+endif
 
-libplaylist_a_DEPENDENCIES = @PLAYLIST_OBJECTS@
+if USE_PERL
+libplaylist_a_SOURCES += pm_perl.c
+endif
 
 EXTRA_DIST = pm_perl.c pm_python.c

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