[xiph-cvs] cvs commit: vorbis-tools/vorbiscomment Makefile.am
Stan Seibert
volsung at xiph.org
Tue Jul 2 09:45:17 PDT 2002
volsung 02/07/02 09:45:17
Modified: . configure.in
ogg123 Makefile.am
oggdec Makefile.am
oggenc Makefile.am
oggenc/man Makefile.am
ogginfo Makefile.am
vcut Makefile.am
vorbiscomment Makefile.am
Log:
Now all of the tools can be selectively compiled.
Revision Changes Path
1.41 +19 -4 vorbis-tools/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure.in 2002/07/02 15:33:24 1.40
+++ configure.in 2002/07/02 16:45:14 1.41
@@ -78,6 +78,17 @@
LDFLAGS="$LDFLAGS $ldflags_save"
dnl --------------------------------------------------
+dnl Allow tools to be selectively built
+dnl --------------------------------------------------
+AC_ARG_ENABLE(ogg123, [ --disable-ogg123 Skip building ogg123], build_ogg123="$enableval", build_ogg123="yes")
+AC_ARG_ENABLE(oggdec, [ --disable-oggdec Skip building oggdec], build_oggdec="$enableval", build_oggdec="yes")
+AC_ARG_ENABLE(oggenc, [ --disable-oggenc Skip building oggenc], build_oggenc="$enableval", build_oggenc="yes")
+AC_ARG_ENABLE(ogginfo,[ --disable-ogginfo Skip building ogginfo], build_ogginfo="$enableval", build_ogginfo="yes")
+AC_ARG_ENABLE(vcut, [ --disable-vcut Skip building vcut], build_vcut="$enableval", build_vcut="yes")
+AC_ARG_ENABLE(vorbiscomment, [ --disable-vorbiscomment Skip building vorbiscomment], build_vorbiscomment="$enableval", build_vorbiscomment="yes")
+
+
+dnl --------------------------------------------------
dnl Check for generally needed libraries
dnl --------------------------------------------------
@@ -98,8 +109,6 @@
dnl Check for ogg123 critical libraries
dnl --------------------------------------------------
-AC_ARG_ENABLE(ogg123,[ --disable-ogg123 Skip building ogg123 (a playback utility)], build_ogg123="$enableval", build_ogg123="yes")
-
if test "x$build_ogg123" = xyes; then
AC_MSG_RESULT([checking for ogg123 requirements])
AM_PATH_AO(,build_ogg123=no; AC_MSG_WARN(libao missing))
@@ -111,8 +120,6 @@
AC_MSG_WARN([Prerequisites for ogg123 not met, ogg123 will not be built])
fi
fi
-
-AM_CONDITIONAL(BUILD_OGG123, test "x$build_ogg123" = xyes)
dnl --------------------------------------------------
dnl Check for library functions
@@ -134,9 +141,17 @@
fi
AC_SUBST(MANDIR)
+
dnl --------------------------------------------------
dnl Do substitutions
dnl --------------------------------------------------
+
+AM_CONDITIONAL(BUILD_OGG123, test "x$build_ogg123" = xyes)
+AM_CONDITIONAL(BUILD_OGGDEC, test "x$build_oggdec" = xyes)
+AM_CONDITIONAL(BUILD_OGGENC, test "x$build_oggenc" = xyes)
+AM_CONDITIONAL(BUILD_OGGINFO, test "x$build_ogginfo" = xyes)
+AM_CONDITIONAL(BUILD_VCUT, test "x$build_vcut" = xyes)
+AM_CONDITIONAL(BUILD_VORBISCOMMENT, test "x$build_vorbiscomment" = xyes)
AC_SUBST(DEBUG)
AC_SUBST(PROFILE)
<p><p>1.24 +0 -2 vorbis-tools/ogg123/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.am 2002/07/02 16:11:14 1.23
+++ Makefile.am 2002/07/02 16:45:15 1.24
@@ -35,8 +35,6 @@
man_MANS = $(mans)
doc_DATA = $(docs)
-else
-
endif
EXTRA_DIST = $(mans) $(docs)
<p><p>1.3 +4 -0 vorbis-tools/oggdec/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggdec/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 2002/07/02 14:14:46 1.2
+++ Makefile.am 2002/07/02 16:45:15 1.3
@@ -2,6 +2,8 @@
AUTOMAKE_OPTIONS = foreign
+if BUILD_OGGDEC
+
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -14,6 +16,8 @@
oggdec_DEPENDENCIES = @SHARE_LIBS@
oggdec_SOURCES = oggdec.c
+
+endif
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.20 +4 -0 vorbis-tools/oggenc/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.am 2002/07/02 16:11:15 1.19
+++ Makefile.am 2002/07/02 16:45:15 1.20
@@ -4,6 +4,8 @@
SUBDIRS = man
+if BUILD_OGGENC
+
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -19,6 +21,8 @@
oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \
audio.h encode.h platform.h resample.c resample.h
+
+endif
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.5 +8 -2 vorbis-tools/oggenc/man/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/man/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 2001/08/04 22:23:21 1.4
+++ Makefile.am 2002/07/02 16:45:16 1.5
@@ -2,7 +2,13 @@
AUTOMAKE_OPTIONS = foreign
+mans = oggenc.1
+
+if BUILD_OGGENC
+
mandir = @MANDIR@
-man_MANS = oggenc.1
+man_MANS = $(mans)
+
+endif
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(mans)
<p><p>1.12 +8 -2 vorbis-tools/ogginfo/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogginfo/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am 2002/07/02 16:11:15 1.11
+++ Makefile.am 2002/07/02 16:45:16 1.12
@@ -2,13 +2,17 @@
AUTOMAKE_OPTIONS = foreign
+mans = ogginfo.1
+
+if BUILD_OGGINFO
+
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
bin_PROGRAMS = ogginfo
mandir = @MANDIR@
-man_MANS = ogginfo.1
+man_MANS = $(mans)
INCLUDES = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @I18N_CFLAGS@
@@ -16,8 +20,10 @@
ogginfo_DEPENDENCIES = @SHARE_LIBS@
ogginfo_SOURCES = ogginfo2.c
+
+endif
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.6 +8 -2 vorbis-tools/vcut/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vcut/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 2002/01/26 11:06:42 1.5
+++ Makefile.am 2002/07/02 16:45:16 1.6
@@ -2,21 +2,27 @@
AUTOMAKE_OPTIONS = foreign
+mans = vcut.1
+
+if BUILD_VCUT
+
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
bin_PROGRAMS = vcut
mandir = @MANDIR@
-man_MANS = vcut.1
+man_MANS = $(mans)
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
vcut_SOURCES = vcut.c vcut.h
+
+endif
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.16 +8 -2 vorbis-tools/vorbiscomment/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am 2002/07/02 16:11:15 1.15
+++ Makefile.am 2002/07/02 16:45:17 1.16
@@ -2,13 +2,17 @@
AUTOMAKE_OPTIONS = foreign
+mans = vorbiscomment.1
+
+if BUILD_VORBISCOMMENT
+
datadir = @datadir@
localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
bin_PROGRAMS = vorbiscomment
mandir = @MANDIR@
-man_MANS = vorbiscomment.1
+man_MANS = $(mans)
INCLUDES = @SHARE_CFLAGS@ @I18N_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
@@ -16,8 +20,10 @@
vorbiscomment_DEPENDENCIES = @SHARE_LIBS@
vorbiscomment_SOURCES = vcedit.c vcedit.h vcomment.c
+
+endif
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><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