eog r4891 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Fri Dec  5 11:34:43 2008
New Revision: 4891
URL: http://svn.gnome.org/viewvc/eog?rev=4891&view=rev

Log:
2008-12-05  Felix Riemann  <friemann svn gnome org>

	* src/Makefile.am: Sanitize include search path order.
	Fixes bug #560070 (Daniel Macks).


Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Dec  5 11:34:43 2008
@@ -142,11 +142,11 @@
 endif
 
 libeog_la_CFLAGS =						\
-	$(EOG_CFLAGS)						\
-	$(WARN_CFLAGS)						\
 	-I$(top_srcdir)/jpegutils				\
 	-I$(top_srcdir)/cut-n-paste/toolbar-editor		\
 	-I$(top_srcdir)/cut-n-paste/totem-screensaver		\
+	$(EOG_CFLAGS)						\
+	$(WARN_CFLAGS)						\
 	-DG_LOG_DOMAIN=\"EOG\"					\
 	-DEOG_PREFIX=\""${prefix}"\"				\
 	-DEOG_DATA_DIR=\""$(pkgdatadir)"\"			\
@@ -179,9 +179,9 @@
 	$(screensaver_DEPS)
 
 eog_CFLAGS = 							\
-	$(EOG_CFLAGS)						\
 	-I$(top_srcdir)/cut-n-paste/toolbar-editor		\
 	-I$(top_srcdir)/cut-n-paste/totem-screensaver		\
+	$(EOG_CFLAGS)						\
 	-DEOG_DATA_DIR=\""$(pkgdatadir)"\"			\
 	-DEOG_LOCALE_DIR=\""$(datadir)/locale"\"