1.1 --- a/Makefile.am	Tue Aug 16 20:07:14 2005 +0000
     1.2 +++ b/Makefile.am	Wed Aug 17 12:35:43 2005 +0000
     1.3 @@ -1,10 +1,6 @@
     1.4  AM_CPPFLAGS = -I$(top_srcdir)
     1.5  LDADD = $(top_builddir)/lemon/libemon.la
     1.6  
     1.7 -
     1.8 -noinst_DATA = guipixbufs.h
     1.9 -CLEANFILES = $(noinst_DATA)
    1.10 -
    1.11  bin_PROGRAMS = gd
    1.12  
    1.13  gd_SOURCES = \
    1.14 @@ -30,23 +26,15 @@
    1.15  
    1.16  gd_CXXFLAGS = $(GTK_CFLAGS)
    1.17  gd_LDFLAGS = $(GTK_LIBS)
    1.18 +gd_CPPFLAGS = -DDATADIR=\"$(datadir)\"
    1.19  
    1.20 -IMAGES = addlink.png addnode.png delete.png \
    1.21 -	editlink.png editnode.png move.png newmap.png
    1.22 +pixmapdir = $(datadir)/pixmaps/gd
    1.23  
    1.24 -VARIABLES = \
    1.25 -	gui_icons_addlink $(srcdir)/addlink.png \
    1.26 -	gui_icons_addnode $(srcdir)/addnode.png \
    1.27 -	gui_icons_delete $(srcdir)/delete.png \
    1.28 -	gui_icons_editlink $(srcdir)/editlink.png \
    1.29 -	gui_icons_editnode $(srcdir)/editnode.png \
    1.30 -	gui_icons_move $(srcdir)/move.png \
    1.31 -	gui_icons_newmap $(srcdir)/newmap.png
    1.32 -
    1.33 -
    1.34 -guipixbufs.h: $(IMAGES)
    1.35 -	gdk-pixbuf-csource \
    1.36 -	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    1.37 -	( rm -f guipixbufs.h && false )
    1.38 -
    1.39 -EXTRA_DIST = $(IMAGES) guipixbufs.h
    1.40 +pixmap_DATA =
    1.41 +	addlink.png \
    1.42 +	addnode.png \
    1.43 +	delete.png \
    1.44 +	editlink.png \
    1.45 +	editnode.png \
    1.46 +	move.png \
    1.47 +	newmap.png