From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sat, 27 Jun 2009 22:56:50 +0000 (+0000)
Subject: Fix AM_CFLAGS and AM_CXXFLAGS from @1701
X-Git-Tag: v1.0.0~132
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=3000474f9d40efec1c4167fe3c87dce3e2814d18

Fix AM_CFLAGS and AM_CXXFLAGS from @1701

The commit 1701 did insert wrong lines for AM_CFLAGS and AM_CXXFLAGS to
src/Makefile.am.

I also did some minor whitespace fixes and made the internal
documentation consistent by using \ than @ for doxygen doc.
---

diff --git a/configure.in b/configure.in
index c696ab43..65e0b0f7 100644
--- a/configure.in
+++ b/configure.in
@@ -103,7 +103,7 @@ fi
 AM_CONDITIONAL(DEBUG, test x$enable_debug_flags = xyes)
 
 AC_ARG_ENABLE(deprecated, [
-AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [], 
+AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [],
 [
 if test "x${enable_developer}" != "xyes"
 then
@@ -282,7 +282,7 @@ if test "x${liblcms}" != "xno"; then
 else
   HAVE_LCMS=disabled
 fi
-	
+
 AM_CONDITIONAL(HAVE_LCMS, [test "x$HAVE_LCMS" = xyes])
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
@@ -308,7 +308,7 @@ if test "x${libexiv2}" != "xno"; then
 else
   HAVE_EXIV2=disabled
 fi
-	
+
 AM_CONDITIONAL(HAVE_EXIV2, [test "x$HAVE_EXIV2" = xyes])
 AC_SUBST(EXIV2_CFLAGS)
 AC_SUBST(EXIV2_LIBS)
@@ -367,32 +367,32 @@ if test "x${libgps}" == "xyes"; then
 else
   HAVE_LIBCHAMPLAIN_GTK=disabled
 fi
-	
+
 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN_GTK, [test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes])
 AC_SUBST(LIBCHAMPLAIN_GTK_CFLAGS)
 AC_SUBST(LIBCHAMPLAIN_GTK_LIBS)
 
 AH_TOP([
-/** @file config.h
- * autogenerated definition by autoheader.
- * @author Bruclik
+/** \file
+ * \short autogenerated definition by autoheader.
+ * \author Bruclik
  */
- 
+
 /*
  *  This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
  *  Copyright (C) 2008 - 2009 The Geeqie Team
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or 
+ *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- */ 
- 
+ */
+
 #ifndef _INCLUDE_CONFIG_H
 #define _INCLUDE_CONFIG_H
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 7740b8d7..255aa892 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,8 @@ AM_CFLAGS =				\
 	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
 	$(LCMS_CFLAGS)			\
 	$(EXIV2_CFLAGS)			\
-	$(LIBCHAMPLAIN_CFLAGS)	\
-	$(LIBCHAMPLAIN_GTK_CFLAGS)
+	$(LIBCHAMPLAIN_CFLAGS)		\
+	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
@@ -15,8 +15,8 @@ AM_CXXFLAGS =				\
 	$(GLIB_CFLAGS) $(GTK_CFLAGS)	\
 	$(LCMS_CFLAGS)			\
 	$(EXIV2_CFLAGS)			\
-	$(LIBCHAMPLAIN_CFLAGS)	\
-	$(LIBCHAMPLAIN_GTK_CFLAGS)	
+	$(LIBCHAMPLAIN_CFLAGS)		\
+	$(LIBCHAMPLAIN_GTK_CFLAGS)	\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)
 
@@ -60,7 +60,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,7 +71,7 @@ ui_spinner.o: ui_icons.h
 
 noinst_DATA = ui_icons.h
 CLEANFILES = $(noinst_DATA)
-                                                                                                                     
+
 extra_SLIK = \
 	$(extra_ICONS)