From 1f99eac2bbfc9a6ea84173840062886f4ffa8493 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 23 Aug 2002 06:45:23 +0000 Subject: [PATCH] fixes based on a pass over everything with autoconf/automake --- Makefile.am | 4 +- Makefile.lite | 10 +++-- configure.in | 16 +++++++- doc/Makefile.am | 2 +- doc/html/Makefile.am | 8 ++++ src/Makefile.am | 12 +++--- src/flac/Makefile.am | 6 ++- src/flac/decode.c | 40 +++++++++++++++++++- src/flac/encode.c | 50 +++++++++++++++++++++++-- src/libOggFLAC/Makefile.am | 2 +- src/libOggFLAC/include/Makefile.am | 2 +- src/monkeys_audio_utilities/Makefile.am | 2 +- src/plugin_winamp2/Makefile.am | 2 + src/plugin_winamp2/Makefile.vc | 6 +-- src/plugin_xmms/Makefile.am | 10 ++++- src/plugin_xmms/Makefile.lite | 11 +++--- src/plugin_xmms/fileinfo.c | 17 ++++----- src/plugin_xmms/plugin.c | 17 ++++----- src/test_libOggFLAC/Makefile.am | 2 +- test/Makefile.am | 10 ++++- 20 files changed, 172 insertions(+), 57 deletions(-) diff --git a/Makefile.am b/Makefile.am index 086e1994..5286bf88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ # -SUBDIRS = doc include man src test +SUBDIRS = doc include man src test build flac.pbproj obj DISTCLEANFILES = libtool-disable-static @@ -39,9 +39,7 @@ EXTRA_DIST = \ COPYING.LGPL \ Makefile.lite \ autogen.sh \ - build \ depcomp \ - flac.pbproj \ strip_fPIC.sh AUTOMAKE_OPTIONS = foreign diff --git a/Makefile.lite b/Makefile.lite index 32cfcc21..aeddb477 100644 --- a/Makefile.lite +++ b/Makefile.lite @@ -27,8 +27,8 @@ # clean : remove all non-distro files # -.PHONY: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_libOggFLAC test_libOggFLAC++ test_streams -all: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_libOggFLAC test_libOggFLAC++ test_streams +.PHONY: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_common plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_libOggFLAC test_libOggFLAC++ test_streams +all: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_common plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_libOggFLAC test_libOggFLAC++ test_streams DEFAULT_CONFIG = release @@ -64,7 +64,10 @@ flac: libFLAC libOggFLAC metaflac: libFLAC share (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) -plugin_xmms: libFLAC +plugin_common: libFLAC + (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) + +plugin_xmms: libFLAC plugin_common (cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG)) test_streams: libFLAC @@ -94,6 +97,7 @@ clean: -(cd src/share ; $(MAKE) -f Makefile.lite clean) -(cd src/flac ; $(MAKE) -f Makefile.lite clean) -(cd src/metaflac ; $(MAKE) -f Makefile.lite clean) + -(cd src/plugin_common ; $(MAKE) -f Makefile.lite clean) -(cd src/plugin_xmms ; $(MAKE) -f Makefile.lite clean) -(cd src/test_libFLAC ; $(MAKE) -f Makefile.lite clean) -(cd src/test_libFLAC++ ; $(MAKE) -f Makefile.lite clean) diff --git a/configure.in b/configure.in index 5e60d1a8..b6c3c82b 100644 --- a/configure.in +++ b/configure.in @@ -105,7 +105,6 @@ AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x) SHARE_LIBS='$(top_builddir)/src/share/libutf8.a $(top_builddir)/src/share/libgetopt.a' dnl check for i18n(internationalization); these are from libiconv/gettext -AM_WITH_NLS AM_ICONV AM_LANGINFO_CODESET @@ -232,15 +231,25 @@ AC_OUTPUT( \ src/libOggFLAC++/Makefile \ src/flac/Makefile \ src/metaflac/Makefile \ + src/monkeys_audio_utilities/flac_mac/Makefile \ + src/monkeys_audio_utilities/flac_ren/Makefile \ + src/monkeys_audio_utilities/Makefile \ + src/plugin_common/Makefile \ + src/plugin_winamp2/Makefile \ + src/plugin_winamp3/Makefile \ src/plugin_xmms/Makefile \ src/share/Makefile \ src/test_libFLAC/Makefile \ src/test_libFLAC++/Makefile \ + src/test_libOggFLAC/Makefile \ + src/test_libOggFLAC++/Makefile \ src/test_streams/Makefile \ include/Makefile \ include/FLAC/Makefile \ include/FLAC/ordinals.h \ include/FLAC++/Makefile \ + include/OggFLAC/Makefile \ + include/OggFLAC++/Makefile \ include/share/Makefile \ doc/Makefile \ doc/html/Makefile \ @@ -248,4 +257,9 @@ AC_OUTPUT( \ doc/html/ru/Makefile \ man/Makefile \ test/Makefile \ + build/Makefile \ + obj/bin/Makefile \ + obj/lib/Makefile \ + obj/Makefile \ + flac.pbproj/Makefile \ ) diff --git a/doc/Makefile.am b/doc/Makefile.am index 1423d8cf..c1f2391d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,7 +27,7 @@ FLAC.tag: Doxyfile docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -doc_DATA = \ +doc_DATA = \ FLAC.tag EXTRA_DIST = Doxyfile Makefile.lite $(doc_DATA) diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index 34b18eba..dd1e9259 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -35,3 +35,11 @@ doc_DATA = \ api EXTRA_DIST = $(doc_DATA) + +# The install targets don't copy whole directories so we have to +# handle 'api/' specially: +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(docdir)/api + (cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api) +uninstall-local: + rm -rf $(DESTDIR)$(docdir)/api diff --git a/src/Makefile.am b/src/Makefile.am index 063ead42..559d3a91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,15 +21,9 @@ endif if FLaC__HAS_OGG OGGFLAC_DIRS = libOggFLAC libOggFLAC++ -#@@@@ tests not written yet: test_libOggFLAC++ -OGGFLAC_TEST_DIRS = test_libOggFLAC +OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++ endif -EXTRA_DIST = \ - monkeys_audio_utilities \ - plugin_winamp2 \ - plugin_winamp3 - SUBDIRS = \ libFLAC \ libFLAC++ \ @@ -37,7 +31,11 @@ SUBDIRS = \ share \ flac \ metaflac \ + monkeys_audio_utilities \ + plugin_common \ $(XMMS_DIRS) \ + plugin_winamp2 \ + plugin_winamp3 \ test_libFLAC \ test_libFLAC++ \ $(OGGFLAC_TEST_DIRS) \ diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index cf9cf945..cc77b73f 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -18,6 +18,10 @@ bin_PROGRAMS = flac CFLAGS = @CFLAGS@ @OGG_CFLAGS@ +if FLaC__HAS_OGG +NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la +endif + EXTRA_DIST = \ Makefile.lite \ Makefile.vc @@ -33,4 +37,4 @@ flac_SOURCES = \ encode.h \ file.h -flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ -lm +flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ -lm diff --git a/src/flac/decode.c b/src/flac/decode.c index 0367b4be..6d0fd96a 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -120,7 +120,24 @@ int flac__decode_wav(const char *infilename, const char *outfilename, FLAC__bool { DecoderSession decoder_session; - if(!DecoderSession_construct(&decoder_session, options.common.is_ogg, options.common.verbose, /*is_wave_out=*/true, options.common.continue_through_decode_errors, analysis_mode, aopts, options.common.skip, infilename, outfilename)) + if(! + DecoderSession_construct( + &decoder_session, +#ifdef FLAC__HAS_OGG + options.common.is_ogg, +#else + /*is_ogg=*/false, +#endif + options.common.verbose, + /*is_wave_out=*/true, + options.common.continue_through_decode_errors, + analysis_mode, + aopts, + options.common.skip, + infilename, + outfilename + ) + ) return 1; if(!DecoderSession_init_decoder(&decoder_session, infilename)) @@ -139,7 +156,24 @@ int flac__decode_raw(const char *infilename, const char *outfilename, FLAC__bool decoder_session.is_big_endian = options.is_big_endian; decoder_session.is_unsigned_samples = options.is_unsigned_samples; - if(!DecoderSession_construct(&decoder_session, options.common.is_ogg, options.common.verbose, /*is_wave_out=*/false, options.common.continue_through_decode_errors, analysis_mode, aopts, options.common.skip, infilename, outfilename)) + if(! + DecoderSession_construct( + &decoder_session, +#ifdef FLAC__HAS_OGG + options.common.is_ogg, +#else + /*is_ogg=*/false, +#endif + options.common.verbose, + /*is_wave_out=*/false, + options.common.continue_through_decode_errors, + analysis_mode, + aopts, + options.common.skip, + infilename, + outfilename + ) + ) return 1; if(!DecoderSession_init_decoder(&decoder_session, infilename)) @@ -155,6 +189,8 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__ { #ifdef FLAC__HAS_OGG d->is_ogg = is_ogg; +#else + (void)is_ogg; #endif d->verbose = verbose; diff --git a/src/flac/encode.c b/src/flac/encode.c index c7485edb..8127ff7d 100644 --- a/src/flac/encode.c +++ b/src/flac/encode.c @@ -140,7 +140,21 @@ flac__encode_aif(FILE *infile, long infilesize, const char *infilename, const ch (void)lookahead; /* silence compiler warning about unused parameter */ (void)lookahead_length; /* silence compiler warning about unused parameter */ - if(!EncoderSession_construct(&encoder_session, options.common.use_ogg, options.common.verify, options.common.verbose, infile, infilename, outfilename)) + if(! + EncoderSession_construct( + &encoder_session, +#ifdef FLAC__HAS_OGG + options.common.use_ogg, +#else + /*use_ogg=*/false, +#endif + options.common.verify, + options.common.verbose, + infile, + infilename, + outfilename + ) + ) return 1; /* lookahead[] already has "FORMxxxxAIFF", do sub-chunks */ @@ -456,7 +470,21 @@ int flac__encode_wav(FILE *infile, long infilesize, const char *infilename, cons (void)lookahead; (void)lookahead_length; - if(!EncoderSession_construct(&encoder_session, options.common.use_ogg, options.common.verify, options.common.verbose, infile, infilename, outfilename)) + if(! + EncoderSession_construct( + &encoder_session, +#ifdef FLAC__HAS_OGG + options.common.use_ogg, +#else + /*use_ogg=*/false, +#endif + options.common.verify, + options.common.verbose, + infile, + infilename, + outfilename + ) + ) return 1; /* @@ -738,7 +766,21 @@ int flac__encode_raw(FILE *infile, long infilesize, const char *infilename, cons FLAC__ASSERT(!options.common.sector_align || options.sample_rate == 44100); FLAC__ASSERT(!options.common.sector_align || infilesize >= 0); - if(!EncoderSession_construct(&encoder_session, options.common.use_ogg, options.common.verify, options.common.verbose, infile, infilename, outfilename)) + if(! + EncoderSession_construct( + &encoder_session, +#ifdef FLAC__HAS_OGG + options.common.use_ogg, +#else + /*use_ogg=*/false, +#endif + options.common.verify, + options.common.verbose, + infile, + infilename, + outfilename + ) + ) return 1; /* get the file length */ @@ -918,6 +960,8 @@ FLAC__bool EncoderSession_construct(EncoderSession *e, FLAC__bool use_ogg, FLAC_ #ifdef FLAC__HAS_OGG e->use_ogg = use_ogg; +#else + (void)use_ogg; #endif e->verify = verify; e->verbose = verbose; diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am index 617b3b98..a70b60ec 100644 --- a/src/libOggFLAC/Makefile.am +++ b/src/libOggFLAC/Makefile.am @@ -22,7 +22,7 @@ DEBUGCFLAGS = endif CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) -SUBDIRS = $(ARCH_SUBDIRS) include . +SUBDIRS = include . m4datadir = $(datadir)/aclocal m4data_DATA = libOggFLAC.m4 diff --git a/src/libOggFLAC/include/Makefile.am b/src/libOggFLAC/include/Makefile.am index c6ad8fa8..d4bd898d 100644 --- a/src/libOggFLAC/include/Makefile.am +++ b/src/libOggFLAC/include/Makefile.am @@ -16,4 +16,4 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -SUBDIRS = private +SUBDIRS = protected diff --git a/src/monkeys_audio_utilities/Makefile.am b/src/monkeys_audio_utilities/Makefile.am index 052d3473..d90e7adf 100644 --- a/src/monkeys_audio_utilities/Makefile.am +++ b/src/monkeys_audio_utilities/Makefile.am @@ -15,4 +15,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -SUBDIRS = flacmac flacren +SUBDIRS = flac_mac flac_ren diff --git a/src/plugin_winamp2/Makefile.am b/src/plugin_winamp2/Makefile.am index 4dc83e5b..d4fa09e7 100644 --- a/src/plugin_winamp2/Makefile.am +++ b/src/plugin_winamp2/Makefile.am @@ -19,4 +19,6 @@ EXTRA_DIST = \ Makefile.vc \ in2.h \ in_flac.c \ + in_flac.dsp \ + in_flac.dsw \ out.h diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc index 2f0f1040..32522895 100644 --- a/src/plugin_winamp2/Makefile.vc +++ b/src/plugin_winamp2/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< !endif C_FILES= \ @@ -33,7 +33,7 @@ OBJS= $(C_FILES:.c=.obj) all: in_flac.dll in_flac.dll: $(OBJS) - link.exe /dll /nodefaultlib:libc.lib /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.dll $(OBJS) libFLAC.lib user32.lib kernel32.lib + link.exe /dll /nodefaultlib:libc.lib /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.dll $(OBJS) libFLAC.lib plugin_common.lib user32.lib kernel32.lib clean: -del *.obj *.pch diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am index 08bc019d..6125d2fd 100644 --- a/src/plugin_xmms/Makefile.am +++ b/src/plugin_xmms/Makefile.am @@ -23,6 +23,14 @@ EXTRA_DIST = \ Makefile.lite \ id3_tag.c +noinst_HEADERS = \ + charset.h \ + configure.h \ + genres.h \ + id3_tag.h \ + mylocale.h \ + wrap_id3.h + CFLAGS = @CFLAGS@ @XMMS_CFLAGS@ xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@ @@ -31,7 +39,7 @@ LIBTOOL = $(top_builddir)/libtool-disable-static xmmsinputplugin_LTLIBRARIES = libxmms-flac.la -plugin_sources = plugin.c wrap_id3.c configure.c charset.c +plugin_sources = configure.c charset.c plugin.c wrap_id3.c id3v2_sources = id3_tag.c if FLaC__HAS_ID3LIB diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite index e1c3c8df..0c3c7a62 100644 --- a/src/plugin_xmms/Makefile.lite +++ b/src/plugin_xmms/Makefile.lite @@ -20,15 +20,14 @@ # LIB_NAME = libxmms-flac -INCLUDES = $(shell xmms-config --cflags) -I./include -I../../include -LIBS = ../../obj/lib/libFLAC.a +INCLUDES = $(shell xmms-config --cflags) -I./include -I../../include -I.. +LIBS = ../../obj/lib/libFLAC.a ../../obj/lib/libplugin-common.a OBJS = \ - plugin.o \ + charset.o \ configure.o \ - wrap_id3.o \ - charset.o - + plugin.o \ + wrap_id3.o include ../../build/lib.mk diff --git a/src/plugin_xmms/fileinfo.c b/src/plugin_xmms/fileinfo.c index 30170734..99820922 100644 --- a/src/plugin_xmms/fileinfo.c +++ b/src/plugin_xmms/fileinfo.c @@ -36,12 +36,12 @@ gboolean get_file_info(char *filename, flac_file_info_struct *tmp_file_info) return FALSE; } - tmp_file_info->sample_rate = streaminfo.data.stream_info.sample_rate; - tmp_file_info->channels = streaminfo.data.stream_info.channels; - tmp_file_info->bits_per_sample = streaminfo.data.stream_info.bits_per_sample; - tmp_file_info->total_samples = streaminfo.data.stream_info.total_samples; + tmp_file_info->sample_rate = streaminfo.data.stream_info.sample_rate; + tmp_file_info->channels = streaminfo.data.stream_info.channels; + tmp_file_info->bits_per_sample = streaminfo.data.stream_info.bits_per_sample; + tmp_file_info->total_samples = streaminfo.data.stream_info.total_samples; - tmp_file_info->length_in_msec = streaminfo.data.stream_info.total_samples * 10 / (streaminfo.data.stream_info.sample_rate / 100); + tmp_file_info->length_in_msec = streaminfo.data.stream_info.total_samples * 10 / (streaminfo.data.stream_info.sample_rate / 100); return TRUE; } @@ -88,8 +88,7 @@ static gint genre_comp_func(gconstpointer a, gconstpointer b) static gchar* channel_mode_name(int mode) { - static const gchar *channel_mode[] = - {N_("Mono"), N_("Stereo")}; + static const gchar *channel_mode[] = {N_("Mono"), N_("Stereo")}; if (mode < 1 || mode > 2) return ""; return gettext(channel_mode[mode]); @@ -315,11 +314,9 @@ void FLAC_XMMS__file_info_box(char *filename) label_set_text(flac_bitrate, _("Bits/Samples: %d"), tmp_file_info->bits_per_sample); /* tmp_file_info->length_in_msec */ - label_set_text(flac_samplerate, _("Samplerate: %ld Hz"), tmp_file_info->sample_rate); + label_set_text(flac_samplerate, _("Samplerate: %ld Hz"), tmp_file_info->sample_rate); label_set_text(flac_channel, _("Channel: %s"), channel_mode_name(tmp_file_info->channel); #if 0 label_set_text(flac_fileinfo, _("%d frames\nFilesize: %lu B"), num_frames, ftell(fh)); #endif } - - diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index 0145741f..c8238d4a 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -125,22 +125,19 @@ void FLAC_XMMS__init() flac_cfg.convert_char_set = FALSE; cfg = xmms_cfg_open_default_file(); + xmms_cfg_read_boolean(cfg, "flac", "tag_override", &flac_cfg.tag_override); - if (!xmms_cfg_read_string(cfg, "flac", "tag_format", - &flac_cfg.tag_format)) + + if(!xmms_cfg_read_string(cfg, "flac", "tag_format", &flac_cfg.tag_format)) flac_cfg.tag_format = g_strdup("%p - %t"); xmms_cfg_read_boolean(cfg, "flac", "convert_char_set", &flac_cfg.convert_char_set); - if (!xmms_cfg_read_string(cfg, "flac", "file_char_set", - &flac_cfg.file_char_set)) - { + + if(!xmms_cfg_read_string(cfg, "flac", "file_char_set", &flac_cfg.file_char_set)) flac_cfg.file_char_set = get_current_charset(); - } - if (!xmms_cfg_read_string(cfg, "flac", "user_char_set", - &flac_cfg.user_char_set)) - { + + if(!xmms_cfg_read_string(cfg, "flac", "user_char_set", &flac_cfg.user_char_set)) flac_cfg.user_char_set = get_current_charset(); - } decoder_ = FLAC__file_decoder_new(); } diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am index cf50fce3..4fd5f95c 100644 --- a/src/test_libOggFLAC/Makefile.am +++ b/src/test_libOggFLAC/Makefile.am @@ -23,7 +23,7 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@ INCLUDES = noinst_PROGRAMS = test_libOggFLAC -test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libOggFLAC/libFLAC.la @OGG_LIBS@ -lm +test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm test_libOggFLAC_SOURCES = \ decoders.c \ encoders.c \ diff --git a/test/Makefile.am b/test/Makefile.am index 7d6d4afd..a29960a0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -15,16 +15,22 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +if FLaC__HAS_OGG +OGG_TESTS = \ + ./test_libOggFLAC.sh \ + ./test_libOggFLAC++.sh +endif + TESTS = \ ./test_libFLAC.sh \ ./test_libFLAC++.sh \ - ./test_libOggFLAC.sh \ - ./test_libOggFLAC++.sh \ + $(OGG_TESTS) \ ./test_metaflac.sh \ ./test_streams.sh \ ./test_bins.sh EXTRA_DIST = \ + Makefile.lite \ test_libFLAC.sh \ test_libFLAC++.sh \ test_libOggFLAC.sh \