Merge branch 't/gvf'
authorAndre Noll <maan@systemlinux.org>
Fri, 8 Apr 2011 09:12:46 +0000 (11:12 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 8 Apr 2011 09:12:46 +0000 (11:12 +0200)
1  2 
Makefile.in
audiod.c
command.c
fade.c
gui.c
para.h
write.c

diff --cc Makefile.in
@@@ -15,13 -14,12 +15,15 @@@ build_date := $(shell date
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
  uname_rs := $(shell uname -rs)
  cc_version := $(shell $(CC) --version | head -n 1)
 -codename := deterministic entropy
 +codename := infinite rollback
  
+ GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls
 +DEBUG_CPPFLAGS += -Wall
 +DEBUG_CPPFLAGS += -Wformat-security
 +DEBUG_CPPFLAGS += -Wmissing-format-attribute
  # produces false positives
  # DEBUG_CPPFLAGS += -Wunreachable-code
  # DEBUG_CPPFLAGS += -Wwrite-strings
@@@ -94,14 -94,13 +95,13 @@@ endi
  ifndef BUILD_VERBOSE
        BUILD_VERBOSE = 0
  endif
 -ifeq ($(BUILD_VERBOSE),1)
 -      Q =
 -else
 +ifeq ($(BUILD_VERBOSE),0)
        Q = @
 +else
 +      Q =
  endif
  
- .PHONY: dep all clean distclean maintainer-clean install man tarball\
-       .FORCE-GIT-VERSION-FILE
+ .PHONY: dep all clean distclean maintainer-clean install man tarball
  all: dep @executables@ $(man_pages)
  dep: $(deps)
  man: $(man_pages)
diff --cc audiod.c
Simple merge
diff --cc command.c
Simple merge
diff --cc fade.c
Simple merge
diff --cc gui.c
Simple merge
diff --cc para.h
Simple merge
diff --cc write.c
Simple merge