comparison src/Makefile.am @ 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 6bfe8fc7a403
children b302c9f87a36
comparison
equal deleted inserted replaced
1659:ae9441cb4409 1660:3ba101d04c91
3 3
4 AM_CFLAGS = \ 4 AM_CFLAGS = \
5 $(GLIB_CFLAGS) $(GTK_CFLAGS) \ 5 $(GLIB_CFLAGS) $(GTK_CFLAGS) \
6 $(LCMS_CFLAGS) \ 6 $(LCMS_CFLAGS) \
7 $(EXIV2_CFLAGS) \ 7 $(EXIV2_CFLAGS) \
8 $(LIBCHAMPLAIN_CFLAGS) \ 8 $(LIBCHAMPLAIN_CFLAGS) \
9 $(LIBCHAMPLAIN_GTK_CFLAGS) 9 $(LIBCHAMPLAIN_GTK_CFLAGS) \
10 -I$(top_srcdir) \ 10 -I$(top_srcdir) \
11 -I$(top_builddir) 11 -I$(top_builddir)
12 12
13 13
14 AM_CXXFLAGS = \ 14 AM_CXXFLAGS = \
15 $(GLIB_CFLAGS) $(GTK_CFLAGS) \ 15 $(GLIB_CFLAGS) $(GTK_CFLAGS) \
16 $(LCMS_CFLAGS) \ 16 $(LCMS_CFLAGS) \
17 $(EXIV2_CFLAGS) \ 17 $(EXIV2_CFLAGS) \
18 $(LIBCHAMPLAIN_CFLAGS) \ 18 $(LIBCHAMPLAIN_CFLAGS) \
19 $(LIBCHAMPLAIN_GTK_CFLAGS) 19 $(LIBCHAMPLAIN_GTK_CFLAGS) \
20 -I$(top_srcdir) \ 20 -I$(top_srcdir) \
21 -I$(top_builddir) 21 -I$(top_builddir)
22 22
23 module_SLIK = \ 23 module_SLIK = \
24 intl.h \ 24 intl.h \
58 echo '#define UI_ICONS_H'; echo; \ 58 echo '#define UI_ICONS_H'; echo; \
59 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \ 59 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \
60 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!" 60 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!"
61 61
62 ClayRGB1998_icc.h: ClayRGB1998.icc 62 ClayRGB1998_icc.h: ClayRGB1998.icc
63 echo "/*" > $@ 63 echo "/*" > $@
64 echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@ 64 echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@
65 echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@ 65 echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@
66 echo " */ " >> $@ 66 echo " */ " >> $@
67 xxd -i $^ >> $@ 67 xxd -i $^ >> $@
68 68
69 ui_spinner.o: ui_icons.h 69 ui_spinner.o: ui_icons.h
70 70
71 71
72 noinst_DATA = ui_icons.h 72 noinst_DATA = ui_icons.h
73 CLEANFILES = $(noinst_DATA) 73 CLEANFILES = $(noinst_DATA)
74 74
75 extra_SLIK = \ 75 extra_SLIK = \
76 $(extra_ICONS) 76 $(extra_ICONS)
77 77
78 bin_PROGRAMS = geeqie 78 bin_PROGRAMS = geeqie
79 79