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
329973c
..
02cfeec
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-7,6
+7,7
@@
AM_CFLAGS = \
$(EXIV2_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(EXIV2_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
+ $(LUA_CFLAGS) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
@@
-19,6
+20,7
@@
AM_CXXFLAGS = \
$(EXIV2_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
$(EXIV2_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(LIBCHAMPLAIN_GTK_CFLAGS) \
+ $(LUA_CFLAGS) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_GTK_CFLAGS) \
-I$(top_srcdir) \
@@
-257,9
+259,10
@@
geeqie_SOURCES = \
view_file_icon.c \
view_file_icon.h \
window.c \
view_file_icon.c \
view_file_icon.h \
window.c \
- window.h
+ window.h \
+ lua.c
-geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_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)