[xiph-cvs] cvs commit: ices/src/playlist Makefile.am
Brendan
brendan at xiph.org
Fri Mar 14 04:46:00 PST 2003
brendan 03/03/14 07:46:00
Modified: . Makefile.am configure.ac
src Makefile.am
src/playlist Makefile.am
Log:
Roll back to automake 1.6 so the build scripts on motherfish will work.
Sniff, automake 1.7 finally got conditional compilation right. I'll miss it.
Revision Changes Path
1.16 +0 -2 ices/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am 8 Mar 2003 23:55:58 -0000 1.15
+++ Makefile.am 14 Mar 2003 12:46:00 -0000 1.16
@@ -1,7 +1,5 @@
## Process this with automake to create Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = src conf doc
EXTRA_DIST = README FEATURES BUGS AUTHORS TODO INSTALL COPYING CHANGES FAQ TESTED README.playlist FILES
<p><p>1.6 +30 -26 ices/configure.ac
Index: configure.ac
===================================================================
RCS file: /cvs/ice/ices/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac 13 Mar 2003 20:51:36 -0000 1.5
+++ configure.ac 14 Mar 2003 12:46:00 -0000 1.6
@@ -1,5 +1,5 @@
# configure script for ices
-# $Id: configure.ac,v 1.5 2003/03/13 20:51:36 brendan Exp $
+# $Id: configure.ac,v 1.6 2003/03/14 12:46:00 brendan Exp $
m4_define(ICES_MAJOR, 0)
m4_define(ICES_MINOR, 2)
@@ -11,28 +11,11 @@
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([src/ices.c])
-AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile src/Makefile src/playlist/Makefile
conf/Makefile conf/ices.conf.dist doc/Makefile doc/ices.1])
VERSION=ICES_VERSION
-AC_ARG_WITH(docdir,
- [[ --with-docdir=DIR put documentation in DIR [PREFIX/doc/ices]]],
- [ices_cv_docdir="$with_docdir"],
- [ices_cv_docdir='${prefix}/doc/ices'])
-
-docdir="$ices_cv_docdir"
-AC_SUBST(docdir)
-
-AC_ARG_WITH(moddir,
- [[ --with-moddir=DIR put playlist modules in DIR [SYSCONFDIR/modules]]],
- [ices_cv_moddir="$with_moddir"],
- [ices_cv_moddir='${sysconfdir}/modules'])
-
-moddir="$ices_cv_moddir"
-AC_SUBST(moddir)
-
dnl -- Finally, actual autoconf stuff --
AC_ARG_PROGRAM
@@ -100,10 +83,28 @@
dnl -- Build system init --
-AM_INIT_AUTOMAKE(ices, $VERSION)
+AM_INIT_AUTOMAKE([1.6 foreign])
+AM_MAINTAINER_MODE
+AM_CONFIG_HEADER(config.h)
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+AC_ARG_WITH(docdir,
+ [[ --with-docdir=DIR put documentation in DIR [PREFIX/doc/ices]]],
+ [ices_cv_docdir="$with_docdir"],
+ [ices_cv_docdir='${prefix}/doc/ices'])
+
+docdir="$ices_cv_docdir"
+AC_SUBST(docdir)
+
+AC_ARG_WITH(moddir,
+ [[ --with-moddir=DIR put playlist modules in DIR [SYSCONFDIR/modules]]],
+ [ices_cv_moddir="$with_moddir"],
+ [ices_cv_moddir='${sysconfdir}/modules'])
+
+moddir="$ices_cv_moddir"
+AC_SUBST(moddir)
+
dnl -- Required extra libraries --
AC_ARG_WITH([shout-config],
@@ -170,6 +171,7 @@
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])
@@ -192,10 +194,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 +237,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
@@ -278,13 +280,13 @@
have_LAME="yes"
LIBS="$LIBS -lmp3lame"
LIBM="-lm"
+ ICES_OBJECTS="$ICES_OBJECTS reencode.o"
AC_DEFINE(HAVE_LIBLAME, 1, [Define if you have the LAME MP3 library])
AC_CHECK_FUNCS([lame_decode_exit])
], [have_LAME="no"], -lm)
fi
fi
-AM_CONDITIONAL(USE_LAME, test "$have_LAME" = "yes")
if test "$with_lame" != "no" -a "$have_LAME" != "yes"
then
@@ -326,11 +328,11 @@
AC_CHECK_LIB(vorbisfile, ov_open, [
LIBS="$LIBS -lvorbisfile -lvorbis -logg"
AC_DEFINE(HAVE_LIBVORBISFILE, 1, [Define if you have libvorbisfile])
+ ICES_OBJECTS="$ICES_OBJECTS in_vorbis.o"
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
@@ -345,14 +347,16 @@
dnl -- and finish up --
LIBS="$LIBS $LIBM $LIBDL"
+AC_SUBST(ICES_OBJECTS)
+AC_SUBST(PLAYLIST_OBJECTS)
AC_OUTPUT
AC_MSG_RESULT([Compiling with: $CPPFLAGS $CFLAGS])
AC_MSG_RESULT([Linking with: $LDFLAGS $LIBS])
AC_MSG_RESULT([Features:])
+AC_MSG_RESULT([ XML : $have_xml])
+AC_MSG_RESULT([ Python : $have_python])
+AC_MSG_RESULT([ Perl : $have_perl])
AC_MSG_RESULT([ LAME : $have_LAME])
AC_MSG_RESULT([ Vorbis : $have_vorbis])
-AC_MSG_RESULT([ Perl : $have_perl])
-AC_MSG_RESULT([ Python : $have_python])
-AC_MSG_RESULT([ XML : $have_xml])
<p><p>1.28 +3 -14 ices/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.am 13 Mar 2003 20:32:55 -0000 1.27
+++ Makefile.am 14 Mar 2003 12:46:00 -0000 1.28
@@ -1,7 +1,5 @@
## Process this with automake to create Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = playlist
bin_PROGRAMS = ices
@@ -13,18 +11,9 @@
ices_SOURCES = ices.c log.c setup.c stream.c util.c mp3.c cue.c metadata.c \
id3.c signals.c
-if USE_XML
-ices_SOURCES += ices_config.c
-endif
-
-if USE_LAME
-ices_SOURCES += reencode.c
-endif
-
-if USE_VORBIS
-ices_SOURCES += in_vorbis.c
-endif
+EXTRA_ices_SOURCES = ices_config.c reencode.c in_vorbis.c
-ices_LDADD = playlist/libplaylist.a
+ices_LDADD = $(ICES_OBJECTS) playlist/libplaylist.a
+ices_DEPENDENCIES = $(ices_LDADD)
AM_CPPFLAGS = -DICES_ETCDIR=\"$(sysconfdir)\" -DICES_MODULEDIR=\"$(moddir)\"
<p><p>1.6 +3 -11 ices/src/playlist/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/playlist/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 13 Mar 2003 20:32:55 -0000 1.5
+++ Makefile.am 14 Mar 2003 12:46:00 -0000 1.6
@@ -1,20 +1,12 @@
## Process this with automake to create Makefile.in
-AUTOMAKE_OPTIONS = foreign
-
INCLUDES = -DICES_MODULEDIR=\"$(moddir)\" -I$(top_srcdir)/src
noinst_LIBRARIES = libplaylist.a
noinst_HEADERS = playlist.h pm_builtin.h rand.h
libplaylist_a_SOURCES = playlist.c pm_builtin.c rand.c
+EXTRA_libplaylist_a_SOURCES = pm_python.c pm_perl.c
-if USE_PYTHON
-libplaylist_a_SOURCES += pm_python.c
-endif
-
-if USE_PERL
-libplaylist_a_SOURCES += pm_perl.c
-endif
-
-EXTRA_DIST = pm_perl.c pm_python.c
+libplaylist_a_LIBADD = $(PLAYLIST_OBJECTS)
+libplaylist_a_DEPENDENCIES = $(libplaylist_a_LIBADD)
<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.
More information about the commits
mailing list