comparison src/Makefile.am @ 2697:10ca4efb9d48 master

Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 03 Jan 2018 21:37:18 +0200
parents 5e0081ebbced f92d97c14b76
children 3c7dec71d9a2
comparison
equal deleted inserted replaced
2564:5e0081ebbced 2697:10ca4efb9d48
7 $(EXIV2_CFLAGS) \ 7 $(EXIV2_CFLAGS) \
8 $(LIBCHAMPLAIN_CFLAGS) \ 8 $(LIBCHAMPLAIN_CFLAGS) \
9 $(LIBCHAMPLAIN_GTK_CFLAGS) \ 9 $(LIBCHAMPLAIN_GTK_CFLAGS) \
10 $(LUA_CFLAGS) \ 10 $(LUA_CFLAGS) \
11 $(CLUTTER_CFLAGS) \ 11 $(CLUTTER_CFLAGS) \
12 $(CLUTTER_GTK_CFLAGS) \ 12 $(CLUTTER_GTK_CFLAGS) \
13 $(FFMPEGTHUMBNAILER_CFLAGS) \
13 -I$(top_srcdir) \ 14 -I$(top_srcdir) \
14 -I$(top_builddir) 15 -I$(top_builddir)
15 16
16 17
17 AM_CXXFLAGS = \ 18 AM_CXXFLAGS = \
20 $(EXIV2_CFLAGS) \ 21 $(EXIV2_CFLAGS) \
21 $(LIBCHAMPLAIN_CFLAGS) \ 22 $(LIBCHAMPLAIN_CFLAGS) \
22 $(LIBCHAMPLAIN_GTK_CFLAGS) \ 23 $(LIBCHAMPLAIN_GTK_CFLAGS) \
23 $(LUA_CFLAGS) \ 24 $(LUA_CFLAGS) \
24 $(CLUTTER_CFLAGS) \ 25 $(CLUTTER_CFLAGS) \
25 $(CLUTTER_GTK_CFLAGS) \ 26 $(CLUTTER_GTK_CFLAGS) \
27 $(FFMPEGTHUMBNAILER_CFLAGS) \
26 -I$(top_srcdir) \ 28 -I$(top_srcdir) \
27 -I$(top_builddir) 29 -I$(top_builddir)
28 30
29 module_SLIK = \ 31 module_SLIK = \
30 intl.h \ 32 intl.h \
56 ICON_PAIRS = \ 58 ICON_PAIRS = \
57 icon_spinner $(srcdir)/ui_spinner.png \ 59 icon_spinner $(srcdir)/ui_spinner.png \
58 icon_tabcomp $(srcdir)/ui_tabcomp.png 60 icon_tabcomp $(srcdir)/ui_tabcomp.png
59 61
60 ui_icons.h: $(extra_ICONS) Makefile.in 62 ui_icons.h: $(extra_ICONS) Makefile.in
61 @(echo '/* Auto generated file, do not edit */'; echo; \ 63 @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \
62 echo '#ifndef UI_ICONS_H'; \ 64 echo '#ifndef UI_ICONS_H'; \
63 echo '#define UI_ICONS_H'; echo; \ 65 echo '#define UI_ICONS_H'; echo; \
64 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \ 66 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \
65 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!" 67 echo '#endif /* UI_ICONS_H */'" > $@ || echo "!!! Failed to generate $@ !!!"
66 68
67 ClayRGB1998_icc.h: ClayRGB1998.icc 69 ClayRGB1998_icc.h: ClayRGB1998.icc
68 echo "/*" > $@ 70 echo "/*" > $@
69 echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@ 71 echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@
70 echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@ 72 echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@
177 image_load_jpeg.h\ 179 image_load_jpeg.h\
178 image_load_tiff.c\ 180 image_load_tiff.c\
179 image_load_tiff.h\ 181 image_load_tiff.h\
180 image_load_bpg.c\ 182 image_load_bpg.c\
181 image_load_bpg.h\ 183 image_load_bpg.h\
184 image_load_ffmpegthumbnailer.c\
185 image_load_ffmpegthumbnailer.h\
182 image-overlay.c \ 186 image-overlay.c \
183 image-overlay.h \ 187 image-overlay.h \
184 img-view.c \ 188 img-view.c \
185 img-view.h \ 189 img-view.h \
186 jpeg_parser.c \ 190 jpeg_parser.c \
239 typedefs.h \ 243 typedefs.h \
240 thumb.c \ 244 thumb.c \
241 thumb.h \ 245 thumb.h \
242 thumb_standard.c \ 246 thumb_standard.c \
243 thumb_standard.h \ 247 thumb_standard.h \
248 toolbar.c \
249 toolbar.h \
244 trash.c \ 250 trash.c \
245 trash.h \ 251 trash.h \
246 uri_utils.c \ 252 uri_utils.c \
247 uri_utils.h \ 253 uri_utils.h \
248 utilops.c \ 254 utilops.c \
257 window.c \ 263 window.c \
258 window.h \ 264 window.h \
259 lua.c \ 265 lua.c \
260 glua.h 266 glua.h
261 267
262 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) 268 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)
263 269
264 EXTRA_DIST = \ 270 EXTRA_DIST = \
265 $(extra_SLIK) 271 $(extra_SLIK)
266 272
267 gq-marshal.h: gq-marshal.list 273 gq-marshal.h: gq-marshal.list