# HG changeset patch # User alpar # Date 1125135154 0 # Node ID 76f4f2ae0e7d2d187b550b23653891f5af098875 # Parent d5aadf09197b97c1c5abca90339995f4bedaf94b Dependency problem (guipixbufs.h) is solved. diff -r d5aadf09197b -r 76f4f2ae0e7d Makefile.am --- a/Makefile.am Sat Aug 27 09:15:59 2005 +0000 +++ b/Makefile.am Sat Aug 27 09:32:34 2005 +0000 @@ -1,10 +1,9 @@ +SUBDIRS = icons + AM_CPPFLAGS = -I$(top_srcdir) LDADD = $(top_builddir)/lemon/libemon.la -noinst_DATA = guipixbufs.h -CLEANFILES = $(noinst_DATA) - bin_PROGRAMS = glemon glemon_SOURCES = \ @@ -27,27 +26,7 @@ new_map_win.cc \ new_map_win.h \ xymap.h \ - guipixbufs.h + icons/guipixbufs.h glemon_CXXFLAGS = $(GTK_CFLAGS) glemon_LDFLAGS = $(GTK_LIBS) - -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 d5aadf09197b -r 76f4f2ae0e7d addlink.png Binary file addlink.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d addnode.png Binary file addnode.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d delete.png Binary file delete.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d editlink.png Binary file editlink.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d editnode.png Binary file editnode.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons/Makefile.am Sat Aug 27 09:32:34 2005 +0000 @@ -0,0 +1,26 @@ +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 d5aadf09197b -r 76f4f2ae0e7d icons/addlink.png Binary file icons/addlink.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/addnode.png Binary file icons/addnode.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/delete.png Binary file icons/delete.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/editlink.png Binary file icons/editlink.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/editnode.png Binary file icons/editnode.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/move.png Binary file icons/move.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d icons/newmap.png Binary file icons/newmap.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d main_win.cc --- a/main_win.cc Sat Aug 27 09:15:59 2005 +0000 +++ b/main_win.cc Sat Aug 27 09:32:34 2005 +0000 @@ -1,5 +1,5 @@ #include "main_win.h" -#include "guipixbufs.h" +#include "icons/guipixbufs.h" MainWin::MainWin() : mapwin("Map Setup", mapstorage, gd_canvas), diff -r d5aadf09197b -r 76f4f2ae0e7d move.png Binary file move.png has changed diff -r d5aadf09197b -r 76f4f2ae0e7d newmap.png Binary file newmap.png has changed