Commit 85d5c538 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

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

parent 96d081c1
......@@ -30,7 +30,7 @@ else
endif
NASM = nasm
LINK = $(CC) $(LINKAGE)
OBJPATH = $(topdir)/obj
OBJPATH = $(topdir)/objs
BINPATH = $(OBJPATH)/$(BUILD)/bin
LIBPATH = $(OBJPATH)/$(BUILD)/lib
DEBUG_BINPATH = $(OBJPATH)/debug/bin
......
......@@ -31,7 +31,7 @@ endif
AS = as
NASM = nasm
LINK = ar cru
OBJPATH = $(topdir)/obj
OBJPATH = $(topdir)/objs
LIBPATH = $(OBJPATH)/$(BUILD)/lib
DEBUG_LIBPATH = $(OBJPATH)/debug/lib
RELEASE_LIBPATH = $(OBJPATH)/release/lib
......
......@@ -20,7 +20,7 @@
#
topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_c_decode_file
......
......@@ -20,7 +20,7 @@
#
topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_c_encode_file
......
......@@ -20,7 +20,7 @@
#
topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_cpp_decode_file
......
......@@ -20,7 +20,7 @@
#
topdir = ../../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = example_cpp_encode_file
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = flac
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = iffscan
......
......@@ -33,7 +33,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = metaflac
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libxmms-flac
INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)
......
......@@ -3,7 +3,7 @@
#
topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm
......
......@@ -3,7 +3,7 @@
#
topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libutf8
......
......@@ -20,7 +20,7 @@
#
topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_cuesheet
......
......@@ -20,7 +20,7 @@
#
topdir = ../../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_picture
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC++
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
LIB_NAME = libtest_libs_common
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_seeking
......
......@@ -20,7 +20,7 @@
#
topdir = ../..
libdir = $(topdir)/obj/$(BUILD)/lib
libdir = $(topdir)/objs/$(BUILD)/lib
PROGRAM_NAME = test_streams
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment