On Fri, Jul 20, 2001 at 05:15:21PM -0700, Josh Coalson wrote:
> I rethought it and it seemed like a bad idea to post
> a big file, so you can get it here:
>
>
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/flac/junk/flac-1.0-src-candidate.tar.bz2
With the attached patch, a complete "make distcheck" should work,
including the
self-tests. It adds missing directories to some SUBDIRS variables, includes
some files that were otherwise missing from the distribution, fixes CFLAGS to
use $(srcdir), adds an EXTRA_DIST where appropriate, adds some missing
Makefiles to AC_OUTPUT, etc.
The only functional change is that src/test_* is built by default, even without
--enable-debug. This is consistent with GNU standards and other auto* users,
and will allow the usual 'make check' idiom to work without fiddling
with
configure flags.
The self-tests are finishing up now (boy there are a lot of noise tests), so I
may have more patches if the rest of the distcheck fails for some reason.
--
- mdz
-------------- next part --------------
Index: Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am 2001/06/08 00:13:21 1.2
+++ Makefile.am 2001/07/21 01:58:17
@@ -34,7 +34,7 @@
#
-SUBDIRS = src test
+SUBDIRS = doc include man src test
DISTCLEANFILES = libtool-disable-static
Index: configure.in
==================================================================RCS file:
/cvsroot/flac/flac/configure.in,v
retrieving revision 1.24
diff -u -r1.24 configure.in
--- configure.in 2001/07/20 23:44:35 1.24
+++ configure.in 2001/07/21 01:58:17
@@ -136,7 +136,7 @@
AC_SUBST(FLaC__USIZE64)
SAVE_CFLAGS="$CFLAGS"
-CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W'
+CFLAGS='-I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
if test x$debug = xtrue; then
CFLAGS="$CFLAGS -g -O0 -DDEBUG"
else
@@ -151,6 +151,9 @@
src/Makefile \
src/libFLAC/Makefile \
src/libFLAC/ia32/Makefile \
+ src/libFLAC/include/Makefile \
+ src/libFLAC/include/private/Makefile \
+ src/libFLAC/include/protected/Makefile \
src/flac/Makefile \
src/metaflac/Makefile \
src/plugin_xmms/Makefile \
@@ -159,5 +162,9 @@
include/Makefile \
include/FLAC/Makefile \
include/FLAC/ordinals.h \
+ doc/Makefile \
+ doc/images/Makefile \
+ doc/ru/Makefile \
+ man/Makefile \
test/Makefile \
)
Index: src/Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/src/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- src/Makefile.am 2001/06/08 00:13:21 1.4
+++ src/Makefile.am 2001/07/21 01:58:17
@@ -19,8 +19,4 @@
XMMS_DIRS = plugin_xmms
endif
-if DEBUG
-DEBUG_DIRS = test_streams test_unit
-endif
-
-SUBDIRS = libFLAC flac metaflac $(XMMS_DIRS) $(DEBUG_DIRS)
+SUBDIRS = libFLAC flac metaflac $(XMMS_DIRS) test_streams test_unit
Index: src/flac/Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/src/flac/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- src/flac/Makefile.am 2001/06/08 00:13:21 1.4
+++ src/flac/Makefile.am 2001/07/21 01:58:17
@@ -23,6 +23,11 @@
decode.c \
encode.c \
file.c \
- main.c
+ main.c \
+ analyze.h \
+ decode.h \
+ encode.h \
+ file.h
+
flac_LDFLAGS = -lm
flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
Index: src/libFLAC/Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/src/libFLAC/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- src/libFLAC/Makefile.am 2001/07/20 23:46:09 1.15
+++ src/libFLAC/Makefile.am 2001/07/21 01:58:17
@@ -31,11 +31,13 @@
else
if FLaC__CPU_IA32
if FLaC__HAS_NASM
-SUBDIRS = ia32 .
+ARCH_SUBDIRS = ia32
libFLAC_la_LIBADD = ia32/libFLAC-asm.a
endif
endif
endif
+
+SUBDIRS = $(ARCH_SUBDIRS) include .
libFLAC_la_LDFLAGS = -version-info 1:0:0
Index: src/libFLAC/ia32/Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/src/libFLAC/ia32/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- src/libFLAC/ia32/Makefile.am 2001/07/20 23:46:09 1.6
+++ src/libFLAC/ia32/Makefile.am 2001/07/21 01:58:17
@@ -21,7 +21,7 @@
STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
.nasm.o:
- $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@
+ $(NASM) -f $(OBJ_FORMAT) -I $(srcdir)/ -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@
# patch from Ben for the above rule that may be needed with new libtool:
#.nasm.lo:
@@ -32,4 +32,5 @@
libFLAC_asm_a_SOURCES = \
cpu_asm.nasm \
fixed_asm.nasm \
- lpc_asm.nasm
+ lpc_asm.nasm \
+ nasm.h
Index: src/test_unit/main.c
==================================================================RCS file:
/cvsroot/flac/flac/src/test_unit/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- src/test_unit/main.c 2001/01/16 20:17:53 1.2
+++ src/test_unit/main.c 2001/07/21 01:58:18
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "bitbuffer.h"
+#include "private/bitbuffer.h"
int main(int argc, char *argv[])
{
Index: test/Makefile.am
==================================================================RCS file:
/cvsroot/flac/flac/test/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- test/Makefile.am 2001/07/18 23:42:07 1.6
+++ test/Makefile.am 2001/07/21 01:58:18
@@ -17,6 +17,10 @@
TESTS = ./test_unit.sh ./test_streams.sh ./test_bins.sh
+EXTRA_DIST = test_unit.sh \
+ test_streams.sh \
+ test_bins.sh
+
CLEANFILES = \
$(wildcard *.raw) $(wildcard *.flac) $(wildcard *.cmp) $(wildcard *.wav) \
$(wildcard ../../test_files/bins/*.raw) \