projects
/
geeqie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into ke-lua
[geeqie.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
cbb9e8a
..
02cfeec
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-8,6
+8,8
@@
AM_CFLAGS = \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(LUA_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(LUA_CFLAGS) \
+ $(CLUTTER_CFLAGS) \
+ $(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir)
-I$(top_srcdir) \
-I$(top_builddir)
@@
-19,6
+21,8
@@
AM_CXXFLAGS = \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(LUA_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(LUA_CFLAGS) \
+ $(CLUTTER_CFLAGS) \
+ $(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir)
-I$(top_srcdir) \
-I$(top_builddir)
@@
-211,6
+215,8
@@
geeqie_SOURCES = \
pixbuf-renderer.h \
renderer-tiles.c \
renderer-tiles.h \
pixbuf-renderer.h \
renderer-tiles.c \
renderer-tiles.h \
+ renderer-clutter.c \
+ renderer-clutter.h \
pixbuf_util.c \
pixbuf_util.h \
preferences.c \
pixbuf_util.c \
pixbuf_util.h \
preferences.c \
@@
-256,7
+262,7
@@
geeqie_SOURCES = \
window.h \
lua.c
window.h \
lua.c
-geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS)
+geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS)
$(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
EXTRA_DIST = \
$(extra_SLIK)
EXTRA_DIST = \
$(extra_SLIK)