From bb4188905ea3fc2ec903f642038eee47bc0a172e Mon Sep 17 00:00:00 2001
From: horchi <vdr@jwendel.de>
Date: Mon, 6 Mar 2017 19:33:05 +0100
Subject: 2017-03-06: version 1.1.44 (horchi)\n   - change: Improved Makefile
 (Thx to magicamun)\n\n

---
 HISTORY.h    |  7 +++++--
 lib/Makefile | 20 ++++++++++++--------
 lib/common.c |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/HISTORY.h b/HISTORY.h
index c3f3836..79ff7e3 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.42"
-#define VERSION_DATE "01.03.2017"
+#define _VERSION     "1.1.44"
+#define VERSION_DATE "06.03.2017"
 
 #define DB_API       4
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2017-03-06: version 1.1.44 (horchi)
+   - change: Improved Makefile (Thx to magicamun)
+
 2017-03-01: version 1.1.43 (horchi)
    - bugfix: Fixed crash in meues without database connection
 
diff --git a/lib/Makefile b/lib/Makefile
index 0fe3774..789bf93 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -22,11 +22,16 @@ ifdef USECURL
    LIBOBJS += curl.o configuration.o thread.o
 endif
 
-BASELIBS = -lrt -lz -luuid 
+CFLAGS += $(shell pkg-config --cflags uuid)
+CFLAGS += $(shell pkg-config --cflags zlib)
+
+BASELIBS = -lrt
 BASELIBS += $(shell mysql_config --libs_r)
+BASELIBS += $(shell pkg-config --libs uuid)
+BASELIBS += $(shell pkg-config --libs zlib)
 
 ifdef USECURL
-   BASELIBS += -lcurl 
+   BASELIBS += -lcurl
 endif
 
 ifdef USEEPGS
@@ -68,17 +73,17 @@ $(LIBTARGET).a : $(LIBOBJS)
 tst: test.o lib
 	$(doLink) test.o $(HLIB) -larchive -lcrypto $(BASELIBS) -o $@
 
-demo: demo.o lib 
+demo: demo.o lib
 	$(doLink) demo.o $(HLIB) -larchive -lcrypto $(BASELIBS) -o $@
 
 pytst: pytst.c python.c python.h hlib
-	$(CC) $(CFLAGS) pytst.c python.c -L./lib -lhorchi $(DLIBS) -o pytst 
+	$(CC) $(CFLAGS) pytst.c python.c -L./lib -lhorchi $(DLIBS) -o pytst
 
 clean:
 	rm -f *.o *~ core $(TEST) $(DEMO) $(LIBTARGET).a
 
 cppchk:
-	cppcheck --template="{file}:{line}:{severity}:{message}" --quiet --force *.c *.h 
+	cppcheck --template="{file}:{line}:{severity}:{message}" --quiet --force *.c *.h
 
 %.o: %.c
 	@echo Compile "$(*F)" ...
@@ -103,6 +108,5 @@ json.o       		:  json.c        		 $(HEADER) json.h
 python.o        :  python.c          $(HEADER) python.h
 searchtimer.o     :  searchtimer.c      $(HEADER) searchtimer.h
 
-demo.o       		:  demo.c        		 $(HEADER) 
-test.o       		:  test.c        		 $(HEADER) 
-
+demo.o       		:  demo.c        		 $(HEADER)
+test.o       		:  test.c        		 $(HEADER)
diff --git a/lib/common.c b/lib/common.c
index 8a0e9ac..fb95c1a 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -13,7 +13,7 @@
 #include <arpa/inet.h>
 
 #ifdef USEUUID
-#  include <uuid/uuid.h>
+#  include <uuid.h>
 #endif
 
 #include <stdarg.h>
-- 
cgit v1.2.3