1 files changed, 14 insertions, 12 deletions
diff --git a/contrib/vdr2jpeg/Makefile b/contrib/vdr2jpeg/Makefile
index 14cf9ec..a113a1b 100644
--- a/contrib/vdr2jpeg/Makefile
+++ b/contrib/vdr2jpeg/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile -- for building vdr2jpeg
 #
-# Copyright (c) 2005-2009 Andreas Brachold
+# Copyright (c) 2005-2010 Andreas Brachold
 #
 # This code is distributed under the terms and conditions of the
 # GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
@@ -60,17 +60,18 @@ 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)
+LIBS += $(shell $(PKG-CONFIG) --libs libavformat libavcodec libavutil libswscale)
+endif
 endif
 
+
 ifdef STATIC
     CXXFLAGS += -static
 endif
@@ -81,13 +82,14 @@ 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_GNU_SOURCE -D__STDC_CONSTANT_MACROS
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
 FILES = README LIESMICH HISTORY COPYING Makefile \
-        gop.cpp gop.h vdr2jpeg.cpp ffm.cpp ffm.h \
-        tools.cpp tools.h
-OBJS = tools.o gop.o ffm.o
-VDR2JPEGOBJS = vdr2jpeg.o
-
+	vdr2jpeg.cpp \
+	gop.cpp gop.h \
+	mpegdec.cpp mpegdec.h \
+	ffm.cpp ffm.h \
+	tools.cpp tools.h
+OBJS = vdr2jpeg.o tools.o gop.o mpegdec.o ffm.o
 
 ################################################################################
 # Implicit rules:
@@ -102,8 +104,8 @@ VDR2JPEGOBJS = vdr2jpeg.o
 all:    vdr2jpeg
 .PHONY: all
 
-vdr2jpeg: $(VDR2JPEGOBJS) $(OBJS)
-	$(CXX) $(CXXFLAGS) $(VDR2JPEGOBJS) $(OBJS) $(FFOBJS) $(LIBS) -o vdr2jpeg
+vdr2jpeg: $(OBJS)
+	$(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o vdr2jpeg
 ifndef DEBUG
 	$(STRIP) $@	
 endif