From acebd3c275fccf7bb0b4f6ac9feb948617fb3a9b Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Sat, 4 Apr 2015 17:42:23 +0200
Subject: reverted Makefile changes in parts

---
 Makefile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cc7a77c..f7cec16 100644
--- a/Makefile
+++ b/Makefile
@@ -54,24 +54,9 @@ LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg
 
 LIBS += $(shell xml2-config --libs)
 
-INCLUDESLIBSD = $(shell pkg-config --silence-errors --cflags libskindesignerapi)
-ifeq ($(strip $(INCLUDESLIBSD)),)
-    INCLUDESLIBSD = $(shell pkg-config --cflags ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-LIBSLIBSD = $(shell pkg-config --silence-errors --libs libskindesignerapi)
-ifeq ($(strip $(LIBSLIBSD)),)
-    LIBSLIBSD = $(shell pkg-config --libs ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-LIBSDVERSION = $(shell pkg-config --silence-errors --modversion libskindesignerapi)
-ifeq ($(strip $(LIBSDVERSION)),)
-    LIBSDVERSION = $(shell pkg-config --modversion ./libskindesignerapi/libskindesignerapi.pc)
-endif
-
-INCLUDES += $(INCLUDESLIBSD)
-LIBS += $(LIBSLIBSD)
-DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(LIBSDVERSION)"'
+INCLUDES += $(shell pkg-config --cflags libskindesignerapi)
+LIBS += $(shell pkg-config --libs libskindesignerapi)
+DEFINES += -DLIBSKINDESIGNERAPIVERSION='"$(shell pkg-config --modversion libskindesignerapi)"'
 
 ### The object files:
 OBJS = $(PLUGIN).o \
-- 
cgit v1.2.3