claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix all Makefile.lite to use /objs/ directory instead of /obj/ directory.

Browse Source
This commit is contained in:
Erik de Castro Lopo
2013-01-02 22:37:42 +11:00
parent 96d081c1c9
commit 85d5c53803
31 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe.mk
View File

@@ -30,7 +30,7 @@ else
endif endif
NASM = nasm NASM = nasm
LINK = $(CC) $(LINKAGE) LINK = $(CC) $(LINKAGE)
OBJPATH = $(topdir)/obj OBJPATH = $(topdir)/objs
BINPATH = $(OBJPATH)/$(BUILD)/bin BINPATH = $(OBJPATH)/$(BUILD)/bin
LIBPATH = $(OBJPATH)/$(BUILD)/lib LIBPATH = $(OBJPATH)/$(BUILD)/lib
DEBUG_BINPATH = $(OBJPATH)/debug/bin DEBUG_BINPATH = $(OBJPATH)/debug/bin

2
build/lib.mk
View File

@@ -31,7 +31,7 @@ endif
AS = as AS = as
NASM = nasm NASM = nasm
LINK = ar cru LINK = ar cru
OBJPATH = $(topdir)/obj OBJPATH = $(topdir)/objs
LIBPATH = $(OBJPATH)/$(BUILD)/lib LIBPATH = $(OBJPATH)/$(BUILD)/lib
DEBUG_LIBPATH = $(OBJPATH)/debug/lib DEBUG_LIBPATH = $(OBJPATH)/debug/lib
RELEASE_LIBPATH = $(OBJPATH)/release/lib RELEASE_LIBPATH = $(OBJPATH)/release/lib

2
examples/c/decode/file/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../../.. topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_c_decode_file PROGRAM_NAME = example_c_decode_file

2
examples/c/encode/file/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../../.. topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_c_encode_file PROGRAM_NAME = example_c_encode_file

2
examples/cpp/decode/file/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../../.. topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_cpp_decode_file PROGRAM_NAME = example_cpp_decode_file

2
examples/cpp/encode/file/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../../.. topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_cpp_encode_file PROGRAM_NAME = example_cpp_encode_file

2
src/flac/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = flac PROGRAM_NAME = flac

2
src/flac/Makefile.lite.iffscan
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = iffscan PROGRAM_NAME = iffscan

2
src/libFLAC++/Makefile.lite
View File

@@ -33,7 +33,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++ EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++

2
src/metaflac/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = metaflac PROGRAM_NAME = metaflac

2
src/plugin_xmms/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libxmms-flac LIB_NAME = libxmms-flac
INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags) INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)

2
src/share/grabbag/Makefile.lite
View File

@@ -3,7 +3,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm

2
src/share/utf8/Makefile.lite
View File

@@ -3,7 +3,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libutf8 LIB_NAME = libutf8

2
src/test_grabbag/cuesheet/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_cuesheet PROGRAM_NAME = test_cuesheet

2
src/test_grabbag/picture/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_picture PROGRAM_NAME = test_picture

2
src/test_libFLAC++/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC++ PROGRAM_NAME = test_libFLAC++

2
src/test_libFLAC/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC PROGRAM_NAME = test_libFLAC

2
src/test_libs_common/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libtest_libs_common LIB_NAME = libtest_libs_common

2
src/test_seeking/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_seeking PROGRAM_NAME = test_seeking

2
src/test_streams/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../.. topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_streams PROGRAM_NAME = test_streams

2
src/utils/flacdiff/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = flacdiff PROGRAM_NAME = flacdiff

2
src/utils/flactimer/Makefile.lite
View File

@@ -20,7 +20,7 @@
# #
topdir = ../../.. topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = flactimer PROGRAM_NAME = flactimer

4
test/test_bins.sh
View File

@@ -35,12 +35,12 @@ LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_==$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_==$(($RANDOM % 255 + 1))
PATH=../src/flac:$PATH PATH=../src/flac:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
BINS_PATH=../../test_files/bins BINS_PATH=../../test_files/bins
if [ x"$FLAC__TEST_LEVEL" = x ] ; then if [ x"$FLAC__TEST_LEVEL" = x ] ; then

2
test/test_compression.sh
View File

@@ -23,7 +23,7 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/flac:$PATH

4
test/test_flac.sh
View File

@@ -49,14 +49,14 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/flac:$PATH
PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../src/metaflac:$PATH
PATH=`pwd`/../src/test_streams:$PATH PATH=`pwd`/../src/test_streams:$PATH
PATH=`pwd`/../obj/$BUILD/bin:$PATH PATH=`pwd`/../objs/$BUILD/bin:$PATH
flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"

4
test/test_grabbag.sh
View File

@@ -32,13 +32,13 @@ fi
LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
PATH=../src/test_grabbag/cuesheet:$PATH PATH=../src/test_grabbag/cuesheet:$PATH
PATH=../src/test_grabbag/picture:$PATH PATH=../src/test_grabbag/picture:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable" test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable"
test_picture -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_picture executable" test_picture -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_picture executable"

4
test/test_libFLAC++.sh
View File

@@ -33,12 +33,12 @@ LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
PATH=../src/test_libFLAC++:$PATH PATH=../src/test_libFLAC++:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
run_test_libFLACpp () run_test_libFLACpp ()
{ {

4
test/test_libFLAC.sh
View File

@@ -32,13 +32,13 @@ fi
LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
PATH=../src/test_libFLAC:$PATH PATH=../src/test_libFLAC:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
run_test_libFLAC () run_test_libFLAC ()
{ {

4
test/test_metaflac.sh
View File

@@ -44,13 +44,13 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/flac:$PATH
PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../src/metaflac:$PATH
PATH=`pwd`/../obj/$BUILD/bin:$PATH PATH=`pwd`/../objs/$BUILD/bin:$PATH
if echo a | (grep -E '(a|b)') >/dev/null 2>&1 if echo a | (grep -E '(a|b)') >/dev/null 2>&1
then EGREP='grep -E' then EGREP='grep -E'

4
test/test_seeking.sh
View File

@@ -30,7 +30,7 @@ else
fi fi
LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
@@ -38,7 +38,7 @@ PATH=../src/flac:$PATH
PATH=../src/metaflac:$PATH PATH=../src/metaflac:$PATH
PATH=../src/test_seeking:$PATH PATH=../src/test_seeking:$PATH
PATH=../src/test_streams:$PATH PATH=../src/test_streams:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
if [ x"$FLAC__TEST_LEVEL" = x ] ; then if [ x"$FLAC__TEST_LEVEL" = x ] ; then
FLAC__TEST_LEVEL=1 FLAC__TEST_LEVEL=1

4
test/test_streams.sh
View File

@@ -29,13 +29,13 @@ else
BUILD="$1" BUILD="$1"
fi fi
LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export MALLOC_CHECK_=3 export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
PATH=../src/flac:$PATH PATH=../src/flac:$PATH
PATH=../src/test_streams:$PATH PATH=../src/test_streams:$PATH
PATH=../obj/$BUILD/bin:$PATH PATH=../objs/$BUILD/bin:$PATH
if [ x"$FLAC__TEST_LEVEL" = x ] ; then if [ x"$FLAC__TEST_LEVEL" = x ] ; then
FLAC__TEST_LEVEL=1 FLAC__TEST_LEVEL=1