From e8ef97ff9e0ff4e4ab2b0f24b5d13e4a9c151ef1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 13 May 2007 00:48:38 +0000
Subject: update Makefile, remove gcc warnings in gperf code

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@6 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
---
 Makefile          |  9 +++++++--
 meta-name-table.h | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 96700a7..c46a30a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 CFLAGS=-Wall -O0 -g -W -Wno-unused-parameter `pkg-config --cflags liboil-0.3` -DRANDOM_PREFIX=sa -DOUTSIDE_SPEEX -D_GNU_SOURCE
 LIBS=-lm `pkg-config --libs liboil-0.3`
 
-test-sine: common.o malloc.o test-sine.o oss.o bbuffer.o format.o volscale.o byteswap.o continued-fraction.o zero.o add.o speex/resample.o resample.o interleave.o converter.o g711.o
+SOURCES=common.c malloc.c test-sine.c oss.c bbuffer.c format.c volscale.c byteswap.c continued-fraction.c zero.c add.c speex/resample.c resample.c interleave.c converter.c g711.c
+OBJS=$(SOURCES:.c=.o)
+
+
+test-sine: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 *.o: *.h
@@ -13,9 +17,10 @@ indent:
 clean:
 	rm -f *.o meta-name-table.h
 
+common.o: meta-name-table.h
 
 meta-name-table.h: meta-name-table.gperf Makefile
-	gperf -t -N lookup_meta_name -H hash_meta_name -p -C < $< > $@
+	gperf -t -N lookup_meta_name -H hash_meta_name -p -C < $< | sed -e 's/{""}/{"", 0}/g' > $@
 
 fixme:
 	find -name '*.c' -exec fgrep -H -A 3 -B 3 -i FIXME \{\} \;
diff --git a/meta-name-table.h b/meta-name-table.h
index 86e515b..61ac647 100644
--- a/meta-name-table.h
+++ b/meta-name-table.h
@@ -92,18 +92,18 @@ lookup_meta_name (str, len)
 {
   static const struct meta_name wordlist[] =
     {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""},
+      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+      {"", 0},
       {"sydney.xid", 7},
       {"sydney.role", 6},
-      {""}, {""}, {""},
+      {"", 0}, {"", 0}, {"", 0},
       {"sydney.icon-png", 5},
       {"sydney.icon-name", 4},
       {"sydney.process-id", 1 },
       {"sydney.stream-name", 3},
-      {""},
+      {"", 0},
       {"sydney.language", 2},
-      {""}, {""},
+      {"", 0}, {"", 0},
       {"sydney.client-name", 0}
     };
 
-- 
cgit