Commit 9df6736e authored by Evan Ramos's avatar Evan Ramos Committed by Erik de Castro Lopo
Browse files

Update Makefile.lite build system.


Signed-off-by: Erik de Castro Lopo's avatarErik de Castro Lopo <erikd@mega-nerd.com>
parent 731655ad
......@@ -16,6 +16,17 @@
# restrictive of those mentioned above. See the file COPYING.Xiph in this
# distribution.
ifeq ($(findstring Windows,$(OS)),Windows) # "Windows" is provided by GNU Make's internal $(OS)
LIBFLAC_DEPS = share/win_utf8_io
else
ifeq ($(findstring MINGW,$(OS)),MINGW) # "MINGW" is provided by config.mk's `uname -s`
LIBFLAC_DEPS = share/win_utf8_io
else
LIBFLAC_DEPS =
endif
endif
libFLAC: $(LIBFLAC_DEPS)
flac: libFLAC share
libFLAC++: libFLAC
metaflac: libFLAC share
......
......@@ -31,7 +31,7 @@
topdir = .
.PHONY: all doc src examples libFLAC libFLAC++ share plugin_common plugin_xmms flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer
.PHONY: all doc src examples libFLAC libFLAC++ share/win_utf8_io share plugin_common plugin_xmms flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer
all: doc src examples
DEFAULT_CONFIG = release
......@@ -52,7 +52,7 @@ doc:
src examples:
(cd $@ && $(MAKE) -f Makefile.lite $(CONFIG))
libFLAC libFLAC++ share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++:
libFLAC libFLAC++ share/win_utf8_io share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++:
(cd src/$@ && $(MAKE) -f Makefile.lite $(CONFIG))
flacdiff flactimer:
......
......@@ -23,21 +23,21 @@
%.debug.o %.release.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
%.debug.o %.release.o : %.cc
$(CCC) $(CFLAGS) -c $< -o $@
$(CCC) $(CXXFLAGS) -c $< -o $@
%.debug.o %.release.o : %.cpp
$(CCC) $(CFLAGS) -c $< -o $@
$(CCC) $(CXXFLAGS) -c $< -o $@
%.debug.pic.o %.release.pic.o : %.c
$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
%.debug.pic.o %.release.pic.o : %.cc
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
$(CCC) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
%.debug.pic.o %.release.pic.o : %.cpp
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
$(CCC) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
%.debug.i %.release.i : %.c
$(CC) $(CFLAGS) -E $< -o $@
%.debug.i %.release.i : %.cc
$(CCC) $(CFLAGS) -E $< -o $@
$(CCC) $(CXXFLAGS) -E $< -o $@
%.debug.i %.release.i : %.cpp
$(CCC) $(CFLAGS) -E $< -o $@
$(CCC) $(CXXFLAGS) -E $< -o $@
%.debug.o %.release.o : %.s
ifeq ($(OS),Darwin)
......
......@@ -22,6 +22,8 @@
USE_OGG ?= 1
USE_ICONV ?= 1
USE_LROUND ?= 1
USE_FSEEKO ?= 1
#
# debug/release selection
......@@ -41,11 +43,10 @@ ifdef PROC_OVERRIDE
else
ifeq ($(findstring MINGW,$(OS)),MINGW)
PROC := i386 # failsafe
USE_ICONV := 0
# ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
USE_ICONV := 0
else ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
USE_ICONV := 0
# ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
PROC := x86_64
endif
else
......@@ -82,7 +83,7 @@ all default: $(DEFAULT_BUILD)
VERSION=\"1.3.0\"
CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
ifeq ($(OS),Darwin)
CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC)
......@@ -125,3 +126,11 @@ endif
OGG_INCLUDE_DIR=$(HOME)/local/include
OGG_LIB_DIR=$(HOME)/local/lib
ifneq (0,$(USE_LROUND))
CONFIG_CFLAGS += -DHAVE_LROUND
endif
ifneq (0,$(USE_FSEEKO))
CONFIG_CFLAGS += -DHAVE_FSEEKO
endif
......@@ -42,11 +42,14 @@ PROGRAM = $(BINPATH)/$(PROGRAM_NAME)
DEBUG_PROGRAM = $(DEBUG_BINPATH)/$(PROGRAM_NAME)
RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME)
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)
CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
CXXFLAGS = $(CFLAGS)
LFLAGS = -L$(LIBPATH)
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
......
......@@ -60,11 +60,14 @@ else
LINKD = $(CC) -shared
endif
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)
CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
CXXFLAGS = $(CFLAGS)
LFLAGS = -L$(LIBPATH)
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
......
......@@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = main.c
......
......@@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = main.c
......
......@@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_CPP = main.cpp
......
......@@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_CPP = main.cpp
......
......@@ -30,7 +30,11 @@ else
endif
endif
.PHONY: all flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer
ifeq ($(findstring MINGW,$(OS)),MINGW)
EXTRA_TARGETS += share/win_utf8_io
endif
.PHONY: all flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share/win_utf8_io share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer
all: flac libFLAC libFLAC++ metaflac plugin_common $(EXTRA_TARGETS) share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils
DEFAULT_CONFIG = release
......
......@@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm
endif
endif
SRCS_C = \
analyze.c \
......
......@@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = \
foreign_metadata.c \
......
......@@ -38,9 +38,13 @@ libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm -lsupc++
else
LIBS = -lFLAC $(OGG_LIBS) -lm -lsupc++
endif
endif
LIB_NAME = libFLAC++
INCLUDES = -I$(topdir)/include
......
......@@ -37,9 +37,13 @@ topdir = ../..
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = $(OGG_LIBS) -lm
endif
endif
LIB_NAME = libFLAC
ifeq ($(PROC),ppc)
......
......@@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm
endif
endif
SRCS_C = \
main.c \
......
......@@ -28,9 +28,13 @@ INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)
# refer to the static libs explicitly
ifeq ($(OS),Darwin)
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm -lstdc++ -lz
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libwin_utf8_io.a $(OGG_LIBS) -lm -lsupc++ -lz
else
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_LIBS) -lm -lsupc++ -lz
endif
endif
SRCS_C = \
charset.c \
......
......@@ -46,9 +46,13 @@ replaygain_synthesis:
utf8:
(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
win_utf8_io:
(cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG))
clean:
-(cd getopt ; $(MAKE) -f Makefile.lite clean)
-(cd grabbag ; $(MAKE) -f Makefile.lite clean)
-(cd replaygain_analysis ; $(MAKE) -f Makefile.lite clean)
-(cd replaygain_synthesis ; $(MAKE) -f Makefile.lite clean)
-(cd utf8 ; $(MAKE) -f Makefile.lite clean)
-(cd win_utf8_io ; $(MAKE) -f Makefile.lite clean)
......@@ -5,7 +5,7 @@
topdir = ../../..
LIB_NAME = libgetopt
INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
INCLUDES = -I$(topdir)/include
SRCS_C = \
getopt.c \
......
......@@ -7,9 +7,13 @@ libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lreplaygain_analysis -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC -lreplaygain_analysis $(OGG_LIBS) -lm
endif
endif
LIB_NAME = libgrabbag
INCLUDES = -I$(topdir)/include
......@@ -20,7 +24,8 @@ SRCS_C = \
file.c \
picture.c \
replaygain.c \
seektable.c
seektable.c \
snprintf.c
include $(topdir)/build/lib.mk
......
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