From e412257abf8de4576a180351d24ff07589fa630c Mon Sep 17 00:00:00 2001
From: chriszero <zerov83@gmail.com>
Date: Sat, 14 Feb 2015 18:53:11 +0100
Subject: Various Fixes Bump Version to frist beta.

---
 Makefile | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 30abf93..95eab3c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,52 +8,20 @@
 # By default the main source file also carries this name.
 
 PLUGIN = plex
+VERSION := $(shell git describe --tags master)
 
 LIBS += -lPocoUtil -lPocoNet -lPocoNetSSL -lPocoXML -lPocoFoundation -lpcrecpp
 
 ### Configuration (edit this for your needs)
 
-    # support avfs a virtual file system
-# FIXME: AVFS isn't working, corrupts memory
-#AVFS ?= $(shell test -x /usr/bin/avfs-config && echo 1)
-    # use ffmpeg libswscale
-#SWSCALE ?= $(shell pkg-config --exists libswscale && echo 1)
-    # support png images
-#PNG ?= $(shell pkg-config --exists libpng && echo 1)
-    # support jpg images
-#JPG ?= $(shell test -r /usr/include/jpeglib.h && echo 1)
-
 CONFIG := #-DDEBUG			# uncomment to build DEBUG
 
-ifeq ($(AVFS),1)
-CONFIG += -DUSE_AVFS
-_CFLAGS += $(shell /usr/bin/avfs-config --cflags)
-LIBS += $(shell /usr/bin/avfs-config --libs)
-endif
-ifeq ($(SWSCALE),1)
-CONFIG += -DUSE_SWSCALE
-_CFLAGS += $(shell pkg-config --cflags libswscale)
-LIBS += $(shell pkg-config --libs libswscale)
-endif
-ifeq ($(PNG),1)
-CONFIG += -DUSE_PNG
-_CFLAGS += $(shell pkg-config --cflags libpng)
-LIBS += $(shell pkg-config --libs libpng)
-endif
-ifeq ($(JPG),1)
-CONFIG += -DUSE_JPG
-_CFLAGS += -I/usr/include
-LIBS += -Ljpeg
-
-endif
-
 
-_CFLAGS += $(shell pkg-config --cflags xcb xcb-image xcb-keysyms xcb-icccm)
-#LIBS += -lrt $(shell pkg-config --libs xcb xcb-image xcb-keysyms xcb-icccm)
+_CFLAGS += $(shell pkg-config --cflags libpcrecpp)
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char \*const VERSION *=' $(PLUGIN).cpp | awk '{ print $$7 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*const VERSION *=' $(PLUGIN).h | awk '{ print $$7 }' | sed -e 's/[";]//g')
 GIT_REV = $(shell git describe --always 2>/dev/null)
 
 ### The directory environment:
-- 
cgit v1.2.3