diff src/Makefile.am @ 686:c0dda0ffb931

configure.in was rewritten: - uses PKG_CHECK_MODULES everywhere - added --enable-debug (enable debugging support) - added --enable-developer (developer mode, checks depreceated code ...) - removed obsoleted INCLUDES from Makefile.am Fixed src/debug.h (added glib.h). Fixed src/exiv2.c compilation with libexiv2 v0.15. Added src/trash.h to src/Makefile.am (fixed generating 'make dist').

--- a/src/Makefile.am	Mon May 19 00:54:59 2008 +0000
+++ b/src/Makefile.am	Mon May 19 01:15:17 2008 +0000
@@ -1,9 +1,20 @@
 SUBDIRS = icons
 DIST_SUBDIRS = icons
 
-INCLUDES = -I$(srcdir) -I$(builddir)    \
-	-I$(top_srcdir) -I$(top_builddir)       \
-	-I$(includedir) $(GTK_CFLAGS)
+AM_CFLAGS =				\
+	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
+	$(LCMS_CFLAGS)			\
+	$(EXIV2_CFLAGS)			\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)
+
+
+AM_CXXFLAGS =				\
+	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
+	$(LCMS_CFLAGS)			\
+	$(EXIV2_CFLAGS)			\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)
 
 module_SLIK = \
 	intl.h		\
@@ -187,6 +198,7 @@
 	thumb_standard.c	\
 	thumb_standard.h	\
 	trash.c		\
+	trash.h		\
 	utilops.c	\
 	utilops.h	\
 	view_dir.c	\
@@ -204,7 +216,7 @@
 	window.c	\
 	window.h
 
-geeqie_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS)
+geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS)
 
 EXTRA_DIST = \
 	$(extra_SLIK)