Updating Opus to a pre-release of 1.1

Makefile.unix

Index: Makefile.unix
diff --git a/Makefile.unix b/Makefile.unix
index 88637c1a14f8ffa90c18911cf9748978dc61688f..c0bab7c636cab8b5d4c3e911b27ba620d1de4a4c 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -20,8 +20,8 @@ CFLAGS := -Drestrict= $(CFLAGS)
 
 ###################### END OF OPTIONS ######################
 
-include version.mk
-CFLAGS += -DOPUS_VERSION='$(OPUS_VERSION)'
+-include package_version
+
 include silk_sources.mk
 include celt_sources.mk
 include opus_sources.mk
@@ -30,6 +30,7 @@ ifdef FIXED_POINT
 SILK_SOURCES += $(SILK_SOURCES_FIXED)
 else
 SILK_SOURCES += $(SILK_SOURCES_FLOAT)
+OPUS_SOURCES += $(OPUS_SOURCES_FLOAT)
 endif
 
 EXESUFFIX =
@@ -45,29 +46,19 @@ CP     = $(TOOLCHAIN_PREFIX)cp
 cppflags-from-defines   = $(addprefix -D,$(1))
 cppflags-from-includes  = $(addprefix -I,$(1))
 ldflags-from-ldlibdirs  = $(addprefix -L,$(1))
-ldlibs-from-libs                = $(addprefix -l,$(1))
+ldlibs-from-libs        = $(addprefix -l,$(1))
 
 WARNINGS = -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow
 CFLAGS  += -O2 -g $(WARNINGS) -DOPUS_BUILD
+CINCLUDES = include silk celt
+
 ifdef FIXED_POINT
 CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API
+CINCLUDES += silk/fixed
+else
+CINCLUDES += silk/float
 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
 
@@ -108,9 +99,7 @@ OPUSCOMPARE_SRCS_C = src/opus_compare.c
 OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C))
 
 # Rules
-default: all
-
-all: $(TARGET) lib opus_demo opus_compare
+all: lib opus_demo opus_compare
 
 lib: $(TARGET)
 
@@ -123,5 +112,20 @@ opus_demo$(EXESUFFIX): $(OPUSDEMO_OBJS) $(TARGET)
 opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS)
 	$(LINK.o.cmdline)
 
+celt/celt.o: CFLAGS += -DPACKAGE_VERSION='$(PACKAGE_VERSION)'
+celt/celt.o: package_version
+
+package_version: force
+	@if [ -x ./update_version ]; then \
+		./update_version || true; \
+	elif [ ! -e ./package_version ]; then \
+		echo 'PACKAGE_VERSION="unknown"' > ./package_version; \
+	fi
+
+force:
+
 clean:
-	rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(OPUSDEMO_OBJS)
+	rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) \
+		$(OBJS) $(OPUSDEMO_OBJS) $(OPUSCOMPARE_OBJS)
+
+.PHONY: all lib clean