[Commits] Makefile.am 1.20.2.25 1.20.2.26

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv31121/src/gtk

Modified Files:
      Tag: gtk2
	Makefile.am 
Log Message:
2011-10-07 [colin]	3.7.10cvs22

	* configure.ac
	* src/messageview.c
	* src/gtk/Makefile.am
		GTK2 build fix

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Makefile.am,v
retrieving revision 1.20.2.25
retrieving revision 1.20.2.26
diff -u -d -r1.20.2.25 -r1.20.2.26
--- Makefile.am	7 Oct 2011 09:40:15 -0000	1.20.2.25
+++ Makefile.am	7 Oct 2011 10:06:26 -0000	1.20.2.26
@@ -6,6 +6,15 @@
 EXTRA_DIST = \
 	claws-marshal.list
 
+if GTK2
+gtk2_sources = \
+	gtkcmctree.c \
+	gtkcmclist.c \
+	gtkcmoptionmenu.c \
+	gtksctree.c \
+	gtkshruler.c
+endif
+
 libclawsgtk_la_SOURCES = \
 	about.c \
 	colorlabel.c \
@@ -15,6 +24,7 @@
 	filesel.c \
 	foldersort.c \
 	gtkaspell.c \
+	$(gtk2_sources) \
 	gtkutils.c \
 	gtkvscrollbutton.c \
 	icon_legend.c \
@@ -55,23 +65,12 @@
 	quicksearch.h \
 	spell_entry.h \
 	sslcertwindow.h \
-	claws-marshal.h
-
-if GTK2
-libclawsgtk_la_SOURCES += \
-	gtkcmctree.c \
-	gtkcmclist.c \
-	gtkcmoptionmenu.c \
-	gtksctree.c \
-	gtkshruler.c
-
-clawsgtkinclude_HEADERS += \
+	claws-marshal.h \
 	gtkcmctree.h \
 	gtkcmclist.h \
 	gtkcmoptionmenu.h \
 	gtksctree.h \
 	gtkshruler.h
-endif
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../common \