# HG changeset patch
# User ladanyi
# Date 1134870663 0
# Node ID ad84ee331106910b2e1ef4bd3ab6e4e1e488af8e
# Parent  2842e7d8f9a2f6b6f6d9d67b572d22e37fa582aa
Added guipixbufs.h to BUILT_SOURCES. This solves 'make dist' problems.

diff -r 2842e7d8f9a2 -r ad84ee331106 Makefile.am
--- a/Makefile.am	Sat Dec 17 21:51:10 2005 +0000
+++ b/Makefile.am	Sun Dec 18 01:51:03 2005 +0000
@@ -1,10 +1,9 @@
-SUBDIRS = icons
-
 AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_builddir)/lemon/libemon.la
 
-
 bin_PROGRAMS = glemon
+BUILT_SOURCES = guipixbufs.h
+CLEANFILES = guipixbufs.h
 
 glemon_SOURCES = \
 	all_include.h \
@@ -33,8 +32,32 @@
 	gui_writer.h \
 	gui_writer.cc \
 	xml.h \
-	icons/guipixbufs.h
-
+	guipixbufs.h
 
 glemon_CXXFLAGS = $(GTK_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS)
+
+IMAGES = \
+	icons/addlink.png \
+	icons/addnode.png \
+	icons/delete.png \
+	icons/editlink.png \
+	icons/editnode.png \
+	icons/move.png \
+	icons/newmap.png
+
+VARIABLES = \
+	gui_icons_addlink $(srcdir)/icons/addlink.png \
+	gui_icons_addnode $(srcdir)/icons/addnode.png \
+	gui_icons_delete $(srcdir)/icons/delete.png \
+	gui_icons_editlink $(srcdir)/icons/editlink.png \
+	gui_icons_editnode $(srcdir)/icons/editnode.png \
+	gui_icons_move $(srcdir)/icons/move.png \
+	gui_icons_newmap $(srcdir)/icons/newmap.png
+
+guipixbufs.h: $(IMAGES)
+	gdk-pixbuf-csource \
+	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
+	( rm -f guipixbufs.h && false )
+
+EXTRA_DIST = $(IMAGES) guipixbufs.h
diff -r 2842e7d8f9a2 -r ad84ee331106 icons/Makefile.am
--- a/icons/Makefile.am	Sat Dec 17 21:51:10 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-LDADD = $(top_builddir)/lemon/libemon.la
-
-
-noinst_DATA = guipixbufs.h
-CLEANFILES = $(noinst_DATA)
-
-IMAGES = addlink.png addnode.png delete.png \
-	editlink.png editnode.png move.png newmap.png
-
-VARIABLES = \
-	gui_icons_addlink $(srcdir)/addlink.png \
-	gui_icons_addnode $(srcdir)/addnode.png \
-	gui_icons_delete $(srcdir)/delete.png \
-	gui_icons_editlink $(srcdir)/editlink.png \
-	gui_icons_editnode $(srcdir)/editnode.png \
-	gui_icons_move $(srcdir)/move.png \
-	gui_icons_newmap $(srcdir)/newmap.png
-
-
-guipixbufs.h: $(IMAGES)
-	gdk-pixbuf-csource \
-	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
-	( rm -f guipixbufs.h && false )
-
-EXTRA_DIST = $(IMAGES) guipixbufs.h
diff -r 2842e7d8f9a2 -r ad84ee331106 main_win.cc
--- a/main_win.cc	Sat Dec 17 21:51:10 2005 +0000
+++ b/main_win.cc	Sun Dec 18 01:51:03 2005 +0000
@@ -1,5 +1,5 @@
 #include "main_win.h"
-#include "icons/guipixbufs.h"
+#include "guipixbufs.h"
 
 MainWin::MainWin()
 {