License update using the IETF Trust flavour of the BSD on the Silk code

[opus.git] / Makefile.draft

diff --git a/Makefile.draft b/Makefile.draft
index d2f307e..800ccee 100644 (file)
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -7,20 +7,20 @@
 # VAR_ARRAYS: Use C99 variable-length arrays for stack allocation
 # USE_ALLOCA: Use alloca() for stack allocation
 # If none is defined, then the fallback is a non-threadsafe global array
-CFLAGS += -DUSE_ALLOCA
-#CFLAGS += -DVAR_ARRAYS
+CFLAGS := -DUSE_ALLOCA $(CFLAGS)
+#CFLAGS := -DVAR_ARRAYS $(CFLAGS)
 
 # These options affect performance
 # HAVE_LRINTF: Use C99 intrinsics to speed up float-to-int conversion
 #      inline: Don't use the 'inline' keyword (for ANSI C compilers)
 #    restrict: Don't use the 'restrict' keyword (for pre-C99 compilers)
-#CFLAGS += -DHAVE_LRINTF
-#CFLAGS += -Dinline=
-CFLAGS += -Drestrict=
+#CFLAGS := -DHAVE_LRINTF $(CFLAGS)
+#CFLAGS := -Dinline= $(CFLAGS)
+CFLAGS := -Drestrict= $(CFLAGS)
 
 ###################### END OF OPTIONS ######################
 
-CFLAGS += -DOPUS_VERSION='"0.9.6"'
+CFLAGS += -DOPUS_VERSION='"0.9.9"'
 include silk_sources.mk
 include celt_sources.mk
 include opus_sources.mk
@@ -36,8 +36,7 @@ LIBPREFIX = lib
 LIBSUFFIX = .a
 OBJSUFFIX = .o
 
-CC     = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
-CXX    = $(TOOLCHAIN_PREFIX)g++$(TOOLCHAIN_SUFFIX)
+CC     = $(TOOLCHAIN_PREFIX)cc$(TOOLCHAIN_SUFFIX)
 AR     = $(TOOLCHAIN_PREFIX)ar
 RANLIB = $(TOOLCHAIN_PREFIX)ranlib
 CP     = $(TOOLCHAIN_PREFIX)cp
@@ -53,13 +52,32 @@ ifdef FIXED_POINT
 CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API
 endif
 
+CINCLUDES += include/ \
+       silk/ \
+       silk/float/ \
+       silk/fixed/ \
+       celt/ \
+       src/
+
+# VPATH e.g. VPATH = src:../headers
+VPATH = ./ \
+       silk/interface \
+       silk/src_FIX \
+       silk/src_FLP \
+       silk/src_SigProc_FIX \
+       silk/src_SigProc_FLP \
+       test
+
+LIBS = m
+
+LDLIBDIRS = ./
+
 CFLAGS  += $(call cppflags-from-defines,$(CDEFINES))
 CFLAGS  += $(call cppflags-from-includes,$(CINCLUDES))
 LDFLAGS += $(call ldflags-from-ldlibdirs,$(LDLIBDIRS))
 LDLIBS  += $(call ldlibs-from-libs,$(LIBS))
 
 COMPILE.c.cmdline   = $(CC) -c $(CFLAGS) -o $@ $<
-COMPILE.cpp.cmdline = $(CXX) -c $(CFLAGS) -o $@ $<
 LINK.o              = $(CC) $(LDPREFLAGS) $(LDFLAGS)
 LINK.o.cmdline      = $(LINK.o) $^ $(LDLIBS) -o $@$(EXESUFFIX)
 
@@ -73,20 +91,6 @@ ARCHIVE.cmdline     = $(AR) $(ARFLAGS) $@ $^ && $(RANLIB) $@
 
 # Directives
 
-CINCLUDES += silk/ \
-        silk/float/ \
-        silk/fixed/ \
-       celt/ \
-       src/
-
-# VPATH e.g. VPATH = src:../headers
-VPATH = ./ \
-        silk/interface \
-        silk/src_FIX \
-        silk/src_FLP \
-        silk/src_SigProc_FIX \
-        silk/src_SigProc_FLP \
-        test
 
 # Variable definitions
 LIB_NAME = opus
@@ -96,31 +100,27 @@ SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OPUS_SOURCES)
 
 OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(SRCS_C))
 
-TESTOPUS_SRCS_C = src/test_opus.c
-TESTOPUS_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUS_SRCS_C))
+OPUSDEMO_SRCS_C = src/opus_demo.c
+OPUSDEMO_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSDEMO_SRCS_C))
 
 OPUSCOMPARE_SRCS_C = src/opus_compare.c
 OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C))
 
-LIBS = m
-
-LDLIBDIRS = ./
-
 # Rules
 default: all
 
-all: $(TARGET) lib test_opus opus_compare
+all: $(TARGET) lib opus_demo opus_compare
 
 lib: $(TARGET)
 
 $(TARGET): $(OBJS)
        $(ARCHIVE.cmdline)
 
-test_opus$(EXESUFFIX): $(TESTOPUS_OBJS) $(TARGET)
+opus_demo$(EXESUFFIX): $(OPUSDEMO_OBJS) $(TARGET)
        $(LINK.o.cmdline)
        
 opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS)
        $(LINK.o.cmdline)
-       
+
 clean:
-       rm -f test_opus$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(TESTOPUS_OBJS)
+       rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(OPUSDEMO_OBJS)