Mercurial > geeqie.yaz
changeset 1660:3ba101d04c91
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.
| author | mow |
|---|---|
| date | Sat, 27 Jun 2009 22:56:50 +0000 |
| parents | ae9441cb4409 |
| children | 28863300018a |
| files | configure.in src/Makefile.am |
| diffstat | 2 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sat Jun 27 22:40:25 2009 +0000 +++ b/configure.in Sat Jun 27 22:56:50 2009 +0000 @@ -103,7 +103,7 @@ 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 @@ 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 @@ 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 @@ 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 ])
--- a/src/Makefile.am Sat Jun 27 22:40:25 2009 +0000 +++ b/src/Makefile.am Sat Jun 27 22:56:50 2009 +0000 @@ -5,8 +5,8 @@ $(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 @@ $(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 @@ 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 @@ noinst_DATA = ui_icons.h CLEANFILES = $(noinst_DATA) - + extra_SLIK = \ $(extra_ICONS)