add notion of topdir to Makefile.lite build system
This commit is contained in:
parent
e29fb7c84c
commit
cd0e322d2d
@ -27,6 +27,8 @@
|
||||
# clean : remove all non-distro files
|
||||
#
|
||||
|
||||
topdir = .
|
||||
|
||||
.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
|
||||
|
||||
@ -56,7 +58,8 @@ libOggFLAC++: libFLAC
|
||||
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
|
||||
|
||||
share:
|
||||
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
|
||||
(cd src/$@/getopt ; $(MAKE) -f Makefile.lite $(CONFIG))
|
||||
(cd src/$@/utf8 ; $(MAKE) -f Makefile.lite $(CONFIG))
|
||||
|
||||
flac: libFLAC libOggFLAC share
|
||||
(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
|
||||
@ -94,7 +97,8 @@ clean:
|
||||
-(cd src/libFLAC++ ; $(MAKE) -f Makefile.lite clean)
|
||||
-(cd src/libOggFLAC ; $(MAKE) -f Makefile.lite clean)
|
||||
-(cd src/libOggFLAC++ ; $(MAKE) -f Makefile.lite clean)
|
||||
-(cd src/share ; $(MAKE) -f Makefile.lite clean)
|
||||
-(cd src/share/getopt ; $(MAKE) -f Makefile.lite clean)
|
||||
-(cd src/share/utf8 ; $(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)
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
VERSION=\"1.0.4\"
|
||||
|
||||
ORDINALS_H = ../../include/FLAC/ordinals.h
|
||||
ORDINALS_H = $(topdir)/include/FLAC/ordinals.h
|
||||
|
||||
$(ORDINALS_H): $(ORDINALS_H).in
|
||||
sed \
|
||||
|
@ -34,13 +34,13 @@ else
|
||||
LINKAGE = -static
|
||||
endif
|
||||
LINK = $(CC) $(LINKAGE)
|
||||
BINPATH = ../../obj/bin
|
||||
LIBPATH = ../../obj/lib
|
||||
BINPATH = $(topdir)/obj/bin
|
||||
LIBPATH = $(topdir)/obj/lib
|
||||
PROGRAM = $(BINPATH)/$(PROGRAM_NAME)
|
||||
|
||||
all : release
|
||||
|
||||
include ../../build/config.mk
|
||||
include $(topdir)/build/config.mk
|
||||
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
|
@ -28,7 +28,7 @@ CCC = g++
|
||||
endif
|
||||
NASM = nasm
|
||||
LINK = ar cru
|
||||
LIBPATH = ../../obj/lib
|
||||
LIBPATH = $(topdir)/obj/lib
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dylib
|
||||
@ -46,7 +46,7 @@ endif
|
||||
|
||||
all : release
|
||||
|
||||
include ../../build/config.mk
|
||||
include $(topdir)/build/config.mk
|
||||
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
|
@ -15,6 +15,8 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
topdir = ..
|
||||
|
||||
FLAC.tag: Doxyfile
|
||||
rm -rf doxytmp
|
||||
doxygen Doxyfile
|
||||
|
@ -19,18 +19,20 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = flac
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
INCLUDES = -I./include -I../../include
|
||||
INCLUDES = -I./include -I$(topdir)/include
|
||||
LIBS = -lFLAC -lgetopt -lutf8 -lc -lm
|
||||
else
|
||||
#@@@ TODO: conditionalize ogg includes, defines, and -logg
|
||||
ifeq ($(SOLARIS_BUILD),yes)
|
||||
INCLUDES = -I./include -I../../include -I$(HOME)/local/include -DFLAC__HAS_OGG
|
||||
INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
|
||||
LIBS = -lOggFLAC -lFLAC -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
|
||||
else
|
||||
#@@@ TODO: conditionalize ogg includes, defines, and -logg
|
||||
INCLUDES = -I./include -I../../include -I$(HOME)/local/include -DFLAC__HAS_OGG
|
||||
INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
|
||||
LIBS = -lOggFLAC -lFLAC -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
|
||||
endif
|
||||
endif
|
||||
@ -43,6 +45,6 @@ OBJS = \
|
||||
main.o \
|
||||
vorbiscomment.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -20,8 +20,10 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libFLAC++
|
||||
INCLUDES = -I../../include
|
||||
INCLUDES = -I$(topdir)/include
|
||||
|
||||
OBJS = \
|
||||
file_decoder.o \
|
||||
@ -32,6 +34,6 @@ OBJS = \
|
||||
stream_decoder.o \
|
||||
stream_encoder.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -20,6 +20,8 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libFLAC
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
DEFINES = -DFLAC__NO_NASM -DFLAC__ALIGN_MALLOC_DATA
|
||||
@ -30,7 +32,7 @@ else
|
||||
DEFINES = -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
|
||||
endif
|
||||
endif
|
||||
INCLUDES = -I./include -I../../include
|
||||
INCLUDES = -I./include -I$(topdir)/include
|
||||
DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
|
||||
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
@ -64,6 +66,6 @@ OBJS = $(ASM_OBJS) \
|
||||
stream_encoder.o \
|
||||
stream_encoder_framing.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -20,13 +20,15 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libOggFLAC++
|
||||
INCLUDES = -I../../include
|
||||
INCLUDES = -I$(topdir)/include
|
||||
|
||||
OBJS = \
|
||||
stream_decoder.o \
|
||||
stream_encoder.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -20,6 +20,8 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libOggFLAC
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
DEFINES =
|
||||
@ -30,13 +32,13 @@ else
|
||||
DEFINES =
|
||||
endif
|
||||
endif
|
||||
INCLUDES = -I./include -I../../include -I$(HOME)/local/include
|
||||
INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include
|
||||
DEBUG_CFLAGS =
|
||||
|
||||
OBJS = \
|
||||
stream_decoder.o \
|
||||
stream_encoder.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -19,13 +19,15 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = metaflac
|
||||
INCLUDES = -I./include -I../../include
|
||||
INCLUDES = -I./include -I$(topdir)/include
|
||||
LIBS = -lFLAC -lgetopt -lutf8 -lm
|
||||
|
||||
OBJS = \
|
||||
main.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -2,8 +2,10 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libplugin_common
|
||||
INCLUDES = -I../../include -I$(HOME)/local/include
|
||||
INCLUDES = -I$(topdir)/include -I$(HOME)/local/include
|
||||
DEFINES = -DFLAC__HAS_ID3LIB -DID3LIB_MAJOR=3 -DID3LIB_MINOR=8 -DID3LIB_PATCH=0
|
||||
|
||||
OBJS = \
|
||||
@ -14,6 +16,6 @@ OBJS = \
|
||||
id3v2.o \
|
||||
vorbiscomment.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -19,9 +19,11 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libxmms-flac
|
||||
INCLUDES = $(shell xmms-config --cflags) -I./include -I../../include -I..
|
||||
LIBS = ../../obj/lib/libFLAC.a ../../obj/lib/libplugin_common.a
|
||||
INCLUDES = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I..
|
||||
LIBS = $(topdir)/obj/lib/libFLAC.a $(topdir)/obj/lib/libplugin_common.a
|
||||
|
||||
OBJS = \
|
||||
charset.o \
|
||||
@ -29,6 +31,6 @@ OBJS = \
|
||||
plugin.o \
|
||||
wrap_id3.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -2,14 +2,16 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
LIB_NAME = libgetopt
|
||||
INCLUDES = -I../../include -I../../include/share
|
||||
INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
|
||||
|
||||
OBJS = \
|
||||
getopt.o \
|
||||
getopt1.o
|
||||
|
||||
include ../../build/lib.mk
|
||||
include $(topdir)/build/lib.mk
|
||||
|
||||
# Our lame Makefile.lite system has no provision for building multiple libs in
|
||||
# a directory, so we hack it:
|
||||
|
@ -19,8 +19,10 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = test_libFLAC++
|
||||
INCLUDES = -I../../include
|
||||
INCLUDES = -I$(topdir)/include
|
||||
LIBS = -lFLAC++ -lFLAC -lm
|
||||
OBJS = \
|
||||
decoders.o \
|
||||
@ -31,7 +33,7 @@ OBJS = \
|
||||
metadata_manip.o \
|
||||
metadata_object.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
LINK = $(CCC) $(LINKAGE)
|
||||
|
||||
|
@ -19,8 +19,10 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = test_libFLAC
|
||||
INCLUDES = -I../libFLAC/include -I../../include
|
||||
INCLUDES = -I../libFLAC/include -I$(topdir)/include
|
||||
LIBS = -lFLAC -lm
|
||||
OBJS = \
|
||||
bitbuffer.o \
|
||||
@ -33,6 +35,6 @@ OBJS = \
|
||||
metadata_object.o \
|
||||
metadata_utils.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -19,9 +19,11 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = test_libOggFLAC++
|
||||
#@@@ TODO: conditionalize ogg lib path and -logg
|
||||
INCLUDES = -I../../include
|
||||
INCLUDES = -I$(topdir)/include
|
||||
LIBS = -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm
|
||||
OBJS = \
|
||||
decoders.o \
|
||||
@ -29,7 +31,7 @@ OBJS = \
|
||||
file_utils.o \
|
||||
main.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
LINK = $(CCC) $(LINKAGE)
|
||||
|
||||
|
@ -19,9 +19,11 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = test_libOggFLAC
|
||||
#@@@ TODO: conditionalize ogg lib path and -logg
|
||||
INCLUDES = -I../../include
|
||||
INCLUDES = -I$(topdir)/include
|
||||
LIBS = -lOggFLAC -lFLAC -lm -L$(HOME)/local/lib -logg
|
||||
OBJS = \
|
||||
decoders.o \
|
||||
@ -30,6 +32,6 @@ OBJS = \
|
||||
main.o \
|
||||
metadata_utils.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -19,12 +19,14 @@
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ../..
|
||||
|
||||
PROGRAM_NAME = test_streams
|
||||
INCLUDES = -I./include -I../../include
|
||||
INCLUDES = -I./include -I$(topdir)/include
|
||||
LIBS = -lm
|
||||
OBJS = \
|
||||
main.o
|
||||
|
||||
include ../../build/exe.mk
|
||||
include $(topdir)/build/exe.mk
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
@ -18,6 +18,9 @@
|
||||
#
|
||||
# GNU makefile
|
||||
#
|
||||
|
||||
topdir = ..
|
||||
|
||||
all: clean
|
||||
FLAC__EXHAUSTIVE_TESTS=yes ./test_libFLAC.sh
|
||||
FLAC__EXHAUSTIVE_TESTS=yes ./test_libFLAC++.sh
|
||||
|
Loading…
Reference in New Issue
Block a user