From 9f5341e9e97212a94f0c1982c73fbbb888aa21d4 Mon Sep 17 00:00:00 2001
From: losinshi <losinshi@dd492736-c11a-0410-ad51-8c26713eaf7f>
Date: Mon, 14 Aug 2006 00:04:55 +0000
Subject: [PATCH] Improved Makefile

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@12 dd492736-c11a-0410-ad51-8c26713eaf7f
---
 seriell/Makefile  | 37 ++++++++++++++++++++-----------------
 seriell/process.c |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/seriell/Makefile b/seriell/Makefile
index 7ff4fa2..5c78576 100644
--- a/seriell/Makefile
+++ b/seriell/Makefile
@@ -1,37 +1,34 @@
 CC      = gcc
 LD      = gcc
 RM	= rm
-#DEBUG   = 
 CFLAGS  = -c
 LDFLAS  = -o
+INCL	= -I$$(pg_config --includedir)
 
 BIN_NAME = weatherdeamon
+OBJS	 = main.o config.o input.o process.o write.o
 
-# Die postgres-pfade bekommt man mit pg_config raus!
-
-# Neue Version nach Make-Buch:
 
 all: $(BIN_NAME)
 #	$(MAKE) cleanup
 
 
 $(BIN_NAME): main.o config.o input.o process.o write.o
-	$(LD) $(DEBUG) $(NOLOG) -L/usr/lib/pgsql -lpq $(LDFLAS) $(BIN_NAME) main.o input.o process.o write.o config.o
+	@ echo Linke: $(LD) $(DEBUG) $(NOLOG) -L$$(pg_config --libdir)/pgsql -lpq $(LDFLAS) $(BIN_NAME) $(OBJS)
+	@ $(LD) $(DEBUG) $(NOLOG) -L$$(pg_config --libdir)/pgsql -lpq $(LDFLAS) $(BIN_NAME) $(OBJS)
+	@ echo Binary $(BIN_NAME) ist fertig!
 
+# Abhängigkeiten
 main.o: main.c main.h definitions.h config.h input.h
-	$(CC) $(DEBUG) $(NOLOG) $(CFLAGS) main.c
-
 config.o: config.c config.h definitions.h
-	$(CC) $(DEBUG) $(NOLOG) $(CFLAGS) config.c
-
 input.o: input.c input.h main.h config.h definitions.h process.h
-	$(CC) $(DEBUG) $(NOLOG) $(CFLAGS) input.c
-
 process.o: process.c process.h main.h config.h definitions.h write.h
-	$(CC) $(DEBUG) $(NOLOG) $(CFLAGS) process.c
-
 write.o: write.c write.h main.h definitions.h
-	$(CC) $(DEBUG) $(NOLOG) -I/usr/include/postgresql $(CFLAGS) write.c
+
+# Compillieren
+$(OBJS):
+	@ echo "Kompilliere: "$(CC) $(DEBUG) $(NOLOG) $(INCL) $(CFLAGS) $*.c
+	@ $(CC) $(DEBUG) $(NOLOG) $(INCL) $(CFLAGS) $*.c
 
 # Programm mit debug-ausgabe bauen
 debug: 
@@ -43,6 +40,12 @@ nolog:
 
 # Aufräumnen (alle Object-Files löschen)
 cleanup:
-	echo "Räume auf...entferne:"
-	echo "  " *.o
-	$(RM) -f *.o
+	@ echo "Räume auf..."
+	@ echo "...entferne Object-Files:"
+	@ echo "  " $(OBJS)
+	@ $(RM) -f $(OBJS)
+
+clean: cleanup
+	@ echo "...lösche binary:"
+	@ echo "  " $(BIN_NAME)
+	@ rm -f $(BIN_NAME)
diff --git a/seriell/process.c b/seriell/process.c
index 72369ad..6277f6a 100644
--- a/seriell/process.c
+++ b/seriell/process.c
@@ -289,7 +289,7 @@ static int convert_signed_int(u_char hi_byte, u_char lo_byte){
   int val;  
   val = convert_unsigned_int(hi_byte,lo_byte);
   if (get_bit(val,14)){
-    val |= ~0x3FFF;
+    val |= ~(0x3FFF);
   }
   return val;
 }