From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Dec 2008 16:27:06 +0000 (+0100)
Subject: Merge branch 'master' into bloom
X-Git-Tag: v0.1.0~14^2~10
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2842e5142322dcc2e42172c28fc041dcc5673dd5;p=adu.git

Merge branch 'master' into bloom
---

2842e5142322dcc2e42172c28fc041dcc5673dd5
diff --cc Makefile
index 4832666,a4293c7..a040478
--- a/Makefile
+++ b/Makefile
@@@ -1,6 -1,7 +1,7 @@@
 -objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.o user.o
 +objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.o user.o bloom.o
  all: adu
  version := 0.0.5
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls