summaryrefslogtreecommitdiff
path: root/contrib/vdr2jpeg/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/vdr2jpeg/Makefile')
-rw-r--r--contrib/vdr2jpeg/Makefile25
1 files changed, 5 insertions, 20 deletions
diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index a113a1b..a303ce0 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -2,7 +2,7 @@
#
# Makefile -- for building vdr2jpeg
#
-# Copyright (c) 2005-2010 Andreas Brachold
+# Copyright (c) 2005-2015 Andreas Brachold
#
# This code is distributed under the terms and conditions of the
# GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
@@ -12,15 +12,13 @@
# You can change the compile options here
# or add options at own file Make.config
-
-# Build ffmpeg e.g. with ./configure --enable-shared --enable-swscale
-#FFMDIR = /usr/local/include/ffmpeg
+# Place where ffmpeg was installed
+FFMPEG_BIN ?= ffmpeg
# Build with debugging symbol and lots of dumped messages
#DEBUG = 1
-# Build full static paket, if ffmpeg configured without --enable-shared
-# you should defined FFMDIR
+# Build full static paket,
#STATIC = 1
# Place where vdr2jpeg should installed
@@ -43,7 +41,6 @@ endif
# Compiler/linker settings
CXX ?= g++
STRIP ?= strip
-PKG-CONFIG ?= pkg-config
# Allow user defined options to overwrite defaults:
-include Make.config
@@ -60,18 +57,6 @@ else
endif
CXXFLAGS += -fPIC -Wall -Woverloaded-virtual
-ifdef FFMDIR
-INCLUDES += -I$(FFMDIR)
-LIBS += -L$(FFMDIR) -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavcodec -L$(FFMDIR)/libavutil -L$(FFMDIR)/libswscale
-LIBS += -lavformat -lavcodec -lavutil -lswscale
-else
-ifeq ($(shell $(PKG-CONFIG) --exists libavformat && echo 1), 1)
-INCLUDES += $(shell $(PKG-CONFIG) --cflags libavformat libavcodec libavutil libswscale)
-LIBS += $(shell $(PKG-CONFIG) --libs libavformat libavcodec libavutil libswscale)
-endif
-endif
-
-
ifdef STATIC
CXXFLAGS += -static
endif
@@ -82,7 +67,7 @@ endif
PRGNAME = vdr2jpeg
VERSION = $(shell grep 'static const char \*VERSION *=' vdr2jpeg.cpp | awk '{ print $$6 }' | sed -e 's/[";]//g')
ARCHIVE = $(PRGNAME)-$(VERSION)
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
+DEFINES += -DFFMPEG_BIN=\"$(FFMPEG_BIN)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
FILES = README LIESMICH HISTORY COPYING Makefile \
vdr2jpeg.cpp \
gop.cpp gop.h \