diff --git a/src/test_unit/Makefile.am b/src/test_unit/Makefile.am index 8857577c..3a1217fa 100644 --- a/src/test_unit/Makefile.am +++ b/src/test_unit/Makefile.am @@ -23,15 +23,12 @@ test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm test_unit_SOURCES = \ bitbuffer.c \ decoders.c \ - file_decoder.c \ file_utils.c \ main.c \ metadata.c \ metadata_manip.c \ metadata_object.c \ metadata_utils.c \ - seekable_stream_decoder.c \ - stream_decoder.c \ bitbuffer.h \ decoders.h \ file_utils.h \ diff --git a/src/test_unit/Makefile.lite b/src/test_unit/Makefile.lite index d3e7cda2..eb814db1 100644 --- a/src/test_unit/Makefile.lite +++ b/src/test_unit/Makefile.lite @@ -25,15 +25,12 @@ LIBS = -lFLAC -lm -lefence OBJS = \ bitbuffer.o \ decoders.o \ - file_decoder.o \ file_utils.o \ main.o \ metadata.o \ metadata_manip.o \ metadata_object.o \ - metadata_utils.o \ - stream_decoder.o \ - seekable_stream_decoder.o + metadata_utils.o include ../../build/exe.mk diff --git a/src/test_unit/Makefile.vc b/src/test_unit/Makefile.vc index e7437216..eb0a168f 100644 --- a/src/test_unit/Makefile.vc +++ b/src/test_unit/Makefile.vc @@ -19,24 +19,21 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.2\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.2\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< !endif C_FILES= \ bitbuffer.c \ decoders.c \ - file_decoder.c \ file_utils.c \ main.c \ metadata.c \ metadata_manip.c \ metadata_object.c \ - metadata_utils.c \ - seekable_stream_decoder.c \ - stream_decoder.c + metadata_utils.c OBJS= $(C_FILES:.c=.obj) diff --git a/src/test_unit/file_decoder.c b/src/test_unit/file_decoder.c deleted file mode 100644 index 481417c3..00000000 --- a/src/test_unit/file_decoder.c +++ /dev/null @@ -1,29 +0,0 @@ -/* test_unit - Simple FLAC unit tester - * Copyright (C) 2002 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "file_utils.h" -#include "FLAC/assert.h" -#include "FLAC/file_decoder.h" -#include - -int test_file_decoder() -{ - printf("\n+++ unit test: FLAC__FileDecoder\n\n"); - - return 0; -} diff --git a/src/test_unit/seekable_stream_decoder.c b/src/test_unit/seekable_stream_decoder.c deleted file mode 100644 index ca92344e..00000000 --- a/src/test_unit/seekable_stream_decoder.c +++ /dev/null @@ -1,29 +0,0 @@ -/* test_unit - Simple FLAC unit tester - * Copyright (C) 2002 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "file_utils.h" -#include "FLAC/assert.h" -#include "FLAC/seekable_stream_decoder.h" -#include - -int test_seekable_stream_decoder() -{ - printf("\n+++ unit test: FLAC__SeekableStreamDecoder\n\n"); - - return 0; -} diff --git a/src/test_unit/stream_decoder.c b/src/test_unit/stream_decoder.c deleted file mode 100644 index 75ebf8f6..00000000 --- a/src/test_unit/stream_decoder.c +++ /dev/null @@ -1,29 +0,0 @@ -/* test_unit - Simple FLAC unit tester - * Copyright (C) 2002 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "file_utils.h" -#include "FLAC/assert.h" -#include "FLAC/stream_decoder.h" -#include - -int test_stream_decoder() -{ - printf("\n+++ unit test: FLAC__StreamDecoder\n\n"); - - return 0; -}