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

---
 lib/Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'lib/Makefile')

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)
-- 
cgit v1.2.3