[eog] Bug 589347 – make install fails due eog-exif-details.h



commit 70ccf38973badad2c6d3695746cfa184b5cc458c
Author: Felix Riemann <friemann gnome org>
Date:   Wed Jul 22 13:05:37 2009 +0200

    Bug 589347 â?? make install fails due eog-exif-details.h
    
    This broke due to automake-1.11 installing all headers in one call and
    eog-exif-details.h was mentioned twice when compiling with both EXIF and
    XMP support enabled.

 src/Makefile.am |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 9fd5403..7be5fd9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,11 +131,16 @@ libeog_la_SOURCES += 			\
 endif
 
 if HAVE_EXEMPI
+# We need to make sure eog-exif-details.h
+# is only listed once in INST_H_FILES
+# or the build will break with automake-1.11
+if !HAVE_EXIF
 INST_H_FILES +=				\
 	eog-exif-details.h
+endif !HAVE_EXIF
 libeog_la_SOURCES +=			\
 	eog-exif-details.c
-endif
+endif HAVE_EXEMPI
 
 libeog_la_CFLAGS =						\
 	-I$(top_srcdir)/jpegutils				\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]