[xiph-cvs] cvs commit: vorbis-tools/vorbiscomment Makefile.am
Stan Seibert
volsung at xiph.org
Wed Jul 10 19:45:39 PDT 2002
volsung 02/07/10 19:45:39
Modified: ogg123 Makefile.am
oggdec Makefile.am
oggenc Makefile.am
ogginfo Makefile.am
vcut Makefile.am
vorbiscomment Makefile.am
Log:
Fixed up selective compilation so you can't accidentally "make dist"
tarballs missing source files you decided not to compile with --disable-*.
Revision Changes Path
1.26 +11 -9 vorbis-tools/ogg123/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.am 2002/07/06 03:23:13 1.25
+++ Makefile.am 2002/07/11 02:45:37 1.26
@@ -4,6 +4,15 @@
mans = ogg123.1
docs = ogg123rc-example
+ogg123sources = audio.c buffer.c callbacks.c \
+ cfgfile_options.c cmdline_options.c \
+ file_transport.c format.c http_transport.c \
+ ogg123.c oggvorbis_format.c playlist.c \
+ status.c transport.c \
+ audio.h buffer.h callbacks.h compat.h \
+ cfgfile_options.h cmdline_options.h \
+ format.h ogg123.h playlist.h status.h \
+ transport.h
if BUILD_OGG123
@@ -24,21 +33,14 @@
@SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
@PTHREAD_LIBS@ @I18N_LIBS@
ogg123_DEPENDENCIES = @SHARE_LIBS@
-ogg123_SOURCES = audio.c buffer.c callbacks.c \
- cfgfile_options.c cmdline_options.c \
- file_transport.c format.c http_transport.c \
- ogg123.c oggvorbis_format.c playlist.c \
- status.c transport.c \
- audio.h buffer.h callbacks.h compat.h \
- cfgfile_options.h cmdline_options.h \
- format.h ogg123.h playlist.h status.h transport.h
+ogg123_SOURCES = $(ogg123sources)
man_MANS = $(mans)
doc_DATA = $(docs)
endif
-EXTRA_DIST = $(mans) $(docs)
+EXTRA_DIST = $(ogg123sources) $(mans) $(docs)
debug:
<p><p>1.7 +3 -2 vorbis-tools/oggdec/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggdec/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 2002/07/04 13:33:33 1.6
+++ Makefile.am 2002/07/11 02:45:37 1.7
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = foreign
mans = oggdec.1
+oggdecsources = oggdec.c
if BUILD_OGGDEC
@@ -17,7 +18,7 @@
oggdec_LDADD = @LIBICONV@ @SHARE_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@
oggdec_DEPENDENCIES = @SHARE_LIBS@
-oggdec_SOURCES = oggdec.c
+oggdec_SOURCES = $(oggdecsources)
man_MANS = $(mans)
mandir = @MANDIR@
@@ -25,7 +26,7 @@
endif
-EXTRA_DIST = $(mans)
+EXTRA_DIST = $(oggdecsources) $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.21 +6 -2 vorbis-tools/oggenc/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am 2002/07/02 16:45:15 1.20
+++ Makefile.am 2002/07/11 02:45:38 1.21
@@ -4,6 +4,9 @@
SUBDIRS = man
+oggencsources = oggenc.c audio.c encode.c platform.c \
+ audio.h encode.h platform.h resample.c resample.h
+
if BUILD_OGGENC
datadir = @datadir@
@@ -19,10 +22,11 @@
@LIBICONV@ @I18N_LIBS@
oggenc_DEPENDENCIES = @SHARE_LIBS@
-oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \
- audio.h encode.h platform.h resample.c resample.h
+oggenc_SOURCES = $(oggencsources)
endif
+
+EXTRA_DIST = $(oggencsources)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.13 +3 -2 vorbis-tools/ogginfo/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogginfo/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am 2002/07/02 16:45:16 1.12
+++ Makefile.am 2002/07/11 02:45:38 1.13
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = foreign
mans = ogginfo.1
+ogginfosources = ogginfo2.c
if BUILD_OGGINFO
@@ -19,11 +20,11 @@
ogginfo_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @I18N_LIBS@
ogginfo_DEPENDENCIES = @SHARE_LIBS@
-ogginfo_SOURCES = ogginfo2.c
+ogginfo_SOURCES = $(ogginfosources)
endif
-EXTRA_DIST = $(mans)
+EXTRA_DIST = $(ogginfosources) $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.7 +3 -2 vorbis-tools/vcut/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vcut/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 2002/07/02 16:45:16 1.6
+++ Makefile.am 2002/07/11 02:45:38 1.7
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = foreign
mans = vcut.1
+vcutsources = vcut.c vcut.h
if BUILD_VCUT
@@ -18,11 +19,11 @@
vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
-vcut_SOURCES = vcut.c vcut.h
+vcut_SOURCES = $(vcutsources)
endif
-EXTRA_DIST = $(mans)
+EXTRA_DIST = $(vcutsources) $(mans)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.17 +3 -2 vorbis-tools/vorbiscomment/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.am 2002/07/02 16:45:17 1.16
+++ Makefile.am 2002/07/11 02:45:39 1.17
@@ -3,6 +3,7 @@
AUTOMAKE_OPTIONS = foreign
mans = vorbiscomment.1
+vorbiscommentsources = vcedit.c vcedit.h vcomment.c
if BUILD_VORBISCOMMENT
@@ -19,11 +20,11 @@
vorbiscomment_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @I18N_LIBS@
vorbiscomment_DEPENDENCIES = @SHARE_LIBS@
-vorbiscomment_SOURCES = vcedit.c vcedit.h vcomment.c
+vorbiscomment_SOURCES = $(vorbiscommentsources)
endif
-EXTRA_DIST = $(mans)
+EXTRA_DIST = $(vorbiscommentsources) $(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