diff -r 4bc163d55528 -r 910b1bcb7d05 gui/Makefile.am
--- a/gui/Makefile.am	Tue Aug 16 20:17:43 2005 +0000
+++ b/gui/Makefile.am	Wed Aug 17 12:35:43 2005 +0000
@@ -1,10 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_builddir)/lemon/libemon.la
 
-
-noinst_DATA = guipixbufs.h
-CLEANFILES = $(noinst_DATA)
-
 bin_PROGRAMS = gd
 
 gd_SOURCES = \
@@ -30,23 +26,15 @@
 
 gd_CXXFLAGS = $(GTK_CFLAGS)
 gd_LDFLAGS = $(GTK_LIBS)
+gd_CPPFLAGS = -DDATADIR=\"$(datadir)\"
 
-IMAGES = addlink.png addnode.png delete.png \
-	editlink.png editnode.png move.png newmap.png
+pixmapdir = $(datadir)/pixmaps/gd
 
-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
+pixmap_DATA =
+	addlink.png \
+	addnode.png \
+	delete.png \
+	editlink.png \
+	editnode.png \
+	move.png \
+	newmap.png