--- a/src/Makefile.am	Sun Jul 23 22:23:48 2017 +0300
+++ b/src/Makefile.am	Wed Jan 03 21:37:18 2018 +0200
@@ -9,7 +9,8 @@
 	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 	$(LUA_CFLAGS)			\
 	$(CLUTTER_CFLAGS)		\
-	$(CLUTTER_GTK_CFLAGS)	\
+	$(CLUTTER_GTK_CFLAGS)		\
+	$(FFMPEGTHUMBNAILER_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
@@ -22,7 +23,8 @@
 	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 	$(LUA_CFLAGS)			\
 	$(CLUTTER_CFLAGS)		\
-	$(CLUTTER_GTK_CFLAGS)	\
+	$(CLUTTER_GTK_CFLAGS)		\
+	$(FFMPEGTHUMBNAILER_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
@@ -58,11 +60,11 @@
 	icon_tabcomp		$(srcdir)/ui_tabcomp.png
 
 ui_icons.h: $(extra_ICONS) Makefile.in
-	@(echo '/* Auto generated file, do not edit */'; echo; \
+	@sh -ec "echo '/* Auto generated file, do not edit */'; echo; \
 	 echo '#ifndef UI_ICONS_H'; \
 	 echo '#define UI_ICONS_H'; echo; \
 	 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \
-	 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!"
+	 echo '#endif /* UI_ICONS_H */'" > $@ || echo "!!! Failed to generate $@ !!!"
 
 ClayRGB1998_icc.h: ClayRGB1998.icc
 	echo "/*" > $@
@@ -179,6 +181,8 @@
 	image_load_tiff.h\
 	image_load_bpg.c\
 	image_load_bpg.h\
+	image_load_ffmpegthumbnailer.c\
+	image_load_ffmpegthumbnailer.h\
 	image-overlay.c	\
 	image-overlay.h	\
 	img-view.c	\
@@ -241,6 +245,8 @@
 	thumb.h		\
 	thumb_standard.c	\
 	thumb_standard.h	\
+	toolbar.c	\
+	toolbar.h	\
 	trash.c		\
 	trash.h		\
 	uri_utils.c	\
@@ -259,7 +265,7 @@
 	lua.c		\
 	glua.h
 
-geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(BPG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
+geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(BPG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(FFMPEGTHUMBNAILER_LIBS)
 
 EXTRA_DIST = \
 	$(extra_SLIK)