1.1 --- a/gui/Makefile.am	Sat Dec 17 21:51:10 2005 +0000
     1.2 +++ b/gui/Makefile.am	Sun Dec 18 01:51:03 2005 +0000
     1.3 @@ -1,10 +1,9 @@
     1.4 -SUBDIRS = icons
     1.5 -
     1.6  AM_CPPFLAGS = -I$(top_srcdir)
     1.7  LDADD = $(top_builddir)/lemon/libemon.la
     1.8  
     1.9 -
    1.10  bin_PROGRAMS = glemon
    1.11 +BUILT_SOURCES = guipixbufs.h
    1.12 +CLEANFILES = guipixbufs.h
    1.13  
    1.14  glemon_SOURCES = \
    1.15  	all_include.h \
    1.16 @@ -33,8 +32,32 @@
    1.17  	gui_writer.h \
    1.18  	gui_writer.cc \
    1.19  	xml.h \
    1.20 -	icons/guipixbufs.h
    1.21 -
    1.22 +	guipixbufs.h
    1.23  
    1.24  glemon_CXXFLAGS = $(GTK_CFLAGS)
    1.25  glemon_LDFLAGS = $(GTK_LIBS)
    1.26 +
    1.27 +IMAGES = \
    1.28 +	icons/addlink.png \
    1.29 +	icons/addnode.png \
    1.30 +	icons/delete.png \
    1.31 +	icons/editlink.png \
    1.32 +	icons/editnode.png \
    1.33 +	icons/move.png \
    1.34 +	icons/newmap.png
    1.35 +
    1.36 +VARIABLES = \
    1.37 +	gui_icons_addlink $(srcdir)/icons/addlink.png \
    1.38 +	gui_icons_addnode $(srcdir)/icons/addnode.png \
    1.39 +	gui_icons_delete $(srcdir)/icons/delete.png \
    1.40 +	gui_icons_editlink $(srcdir)/icons/editlink.png \
    1.41 +	gui_icons_editnode $(srcdir)/icons/editnode.png \
    1.42 +	gui_icons_move $(srcdir)/icons/move.png \
    1.43 +	gui_icons_newmap $(srcdir)/icons/newmap.png
    1.44 +
    1.45 +guipixbufs.h: $(IMAGES)
    1.46 +	gdk-pixbuf-csource \
    1.47 +	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    1.48 +	( rm -f guipixbufs.h && false )
    1.49 +
    1.50 +EXTRA_DIST = $(IMAGES) guipixbufs.h

     2.1 --- a/gui/icons/Makefile.am	Sat Dec 17 21:51:10 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,26 +0,0 @@
     2.4 -AM_CPPFLAGS = -I$(top_srcdir)
     2.5 -LDADD = $(top_builddir)/lemon/libemon.la
     2.6 -
     2.7 -
     2.8 -noinst_DATA = guipixbufs.h
     2.9 -CLEANFILES = $(noinst_DATA)
    2.10 -
    2.11 -IMAGES = addlink.png addnode.png delete.png \
    2.12 -	editlink.png editnode.png move.png newmap.png
    2.13 -
    2.14 -VARIABLES = \
    2.15 -	gui_icons_addlink $(srcdir)/addlink.png \
    2.16 -	gui_icons_addnode $(srcdir)/addnode.png \
    2.17 -	gui_icons_delete $(srcdir)/delete.png \
    2.18 -	gui_icons_editlink $(srcdir)/editlink.png \
    2.19 -	gui_icons_editnode $(srcdir)/editnode.png \
    2.20 -	gui_icons_move $(srcdir)/move.png \
    2.21 -	gui_icons_newmap $(srcdir)/newmap.png
    2.22 -
    2.23 -
    2.24 -guipixbufs.h: $(IMAGES)
    2.25 -	gdk-pixbuf-csource \
    2.26 -	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    2.27 -	( rm -f guipixbufs.h && false )
    2.28 -
    2.29 -EXTRA_DIST = $(IMAGES) guipixbufs.h

     3.1 --- a/gui/main_win.cc	Sat Dec 17 21:51:10 2005 +0000
     3.2 +++ b/gui/main_win.cc	Sun Dec 18 01:51:03 2005 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  #include "main_win.h"
     3.5 -#include "icons/guipixbufs.h"
     3.6 +#include "guipixbufs.h"
     3.7  
     3.8  MainWin::MainWin()
     3.9  {