X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=15bdf1b15930d668f857194431fd62b3dbc3399d;hb=1891113571d9e39bd29b8b6abc661e178ffbcefd;hp=7740b8d71594193ec25d95bba0055a7ba1d69039;hpb=19db93d6eb70f5163b098be3390476c19f10b54e;p=geeqie.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 7740b8d7..15bdf1b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,11 @@ AM_CFLAGS =				\
 	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
 	$(LCMS_CFLAGS)			\
 	$(EXIV2_CFLAGS)			\
-	$(LIBCHAMPLAIN_CFLAGS)	\
-	$(LIBCHAMPLAIN_GTK_CFLAGS)
+	$(LIBCHAMPLAIN_CFLAGS)		\
+	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
+	$(LUA_CFLAGS)			\
+	$(CLUTTER_CFLAGS)		\
+	$(CLUTTER_GTK_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
@@ -15,14 +18,16 @@ AM_CXXFLAGS =				\
 	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
 	$(LCMS_CFLAGS)			\
 	$(EXIV2_CFLAGS)			\
-	$(LIBCHAMPLAIN_CFLAGS)	\
-	$(LIBCHAMPLAIN_GTK_CFLAGS)	
+	$(LIBCHAMPLAIN_CFLAGS)		\
+	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
+	$(LUA_CFLAGS)			\
+	$(CLUTTER_CFLAGS)		\
+	$(CLUTTER_GTK_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
 module_SLIK = \
 	intl.h		\
-	gettext.h	\
 	ui_bookmark.c	\
 	ui_bookmark.h	\
 	ui_fileops.c	\
@@ -60,7 +65,7 @@ ui_icons.h: $(extra_ICONS) Makefile.in
 	 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!"
 
 ClayRGB1998_icc.h: ClayRGB1998.icc
-	echo "/*" > $@ 
+	echo "/*" > $@
 	echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@
 	echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@
 	echo " */ " >> $@
@@ -71,14 +76,19 @@ ui_spinner.o: ui_icons.h
 
 noinst_DATA = ui_icons.h
 CLEANFILES = $(noinst_DATA)
-                                                                                                                     
+
 extra_SLIK = \
 	$(extra_ICONS)
 
+include $(srcdir)/pan-view/Makefile.am
+include $(srcdir)/view_file/Makefile.am
+
 bin_PROGRAMS = geeqie
 
 geeqie_SOURCES = \
 	$(module_SLIK)	\
+	$(module_pan_view)	\
+	$(module_view_file)	\
 	ClayRGB1998.icc \
 	ClayRGB1998_icc.h \
 	advanced_exif.c	\
@@ -161,10 +171,18 @@ geeqie_SOURCES = \
 	image.h		\
 	image-load.c	\
 	image-load.h	\
+	image_load_gdk.c\
+	image_load_gdk.h\
+	image_load_jpeg.c\
+	image_load_jpeg.h\
+	image_load_tiff.c\
+	image_load_tiff.h\
 	image-overlay.c	\
 	image-overlay.h	\
 	img-view.c	\
 	img-view.h	\
+	jpeg_parser.c	\
+	jpeg_parser.h	\
 	layout.c	\
 	layout.h	\
 	layout_config.c	\
@@ -189,17 +207,13 @@ geeqie_SOURCES = \
 	misc.h		\
 	options.c	\
 	options.h	\
-	pan-calendar.c	\
-	pan-folder.c	\
-	pan-grid.c	\
-	pan-item.c	\
-	pan-timeline.c	\
-	pan-types.h	\
-	pan-util.c	\
-	pan-view.c	\
 	pan-view.h	\
 	pixbuf-renderer.c	\
 	pixbuf-renderer.h	\
+	renderer-tiles.c	\
+	renderer-tiles.h	\
+	renderer-clutter.c	\
+	renderer-clutter.h	\
 	pixbuf_util.c	\
 	pixbuf_util.h	\
 	preferences.c	\
@@ -214,6 +228,8 @@ geeqie_SOURCES = \
 	search.h	\
 	secure_save.c	\
 	secure_save.h	\
+	shortcuts.c	\
+	shortcuts.h	\
 	similar.c	\
 	similar.h	\
 	slideshow.c	\
@@ -237,14 +253,12 @@ geeqie_SOURCES = \
 	view_dir_tree.h	\
 	view_file.c	\
 	view_file.h	\
-	view_file_list.c	\
-	view_file_list.h	\
-	view_file_icon.c	\
-	view_file_icon.h	\
 	window.c	\
-	window.h
+	window.h	\
+	lua.c		\
+	glua.h
 
-geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_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)
@@ -252,7 +266,7 @@ EXTRA_DIST = \
 gq-marshal.h: gq-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=gq_marshal $(srcdir)/gq-marshal.list --header >$@
 
-gq-marshal.c: gq-marshal.list
+gq-marshal.c: gq-marshal.list gq-marshal.h
 	(echo "#include \"gq-marshal.h\"" ; $(GLIB_GENMARSHAL) --prefix=gq_marshal $(srcdir)/gq-marshal.list --body ) >$@