Dependency problem (guipixbufs.h) is solved.
authoralpar
Sat, 27 Aug 2005 09:32:34 +0000
changeset 1659ab1e97b7b2b7
parent 1658 6df0b56c0d72
child 1660 93792a112fd5
Dependency problem (guipixbufs.h) is solved.
configure.ac
gui/Makefile.am
gui/addlink.png
gui/addnode.png
gui/delete.png
gui/editlink.png
gui/editnode.png
gui/icons/Makefile.am
gui/icons/addlink.png
gui/icons/addnode.png
gui/icons/delete.png
gui/icons/editlink.png
gui/icons/editnode.png
gui/icons/move.png
gui/icons/newmap.png
gui/main_win.cc
gui/move.png
gui/newmap.png
     1.1 --- a/configure.ac	Sat Aug 27 09:15:59 2005 +0000
     1.2 +++ b/configure.ac	Sat Aug 27 09:32:34 2005 +0000
     1.3 @@ -53,6 +53,7 @@
     1.4  demo/Makefile
     1.5  test/Makefile
     1.6  gui/Makefile
     1.7 +gui/icons/Makefile
     1.8  ])
     1.9  
    1.10  AC_OUTPUT
     2.1 --- a/gui/Makefile.am	Sat Aug 27 09:15:59 2005 +0000
     2.2 +++ b/gui/Makefile.am	Sat Aug 27 09:32:34 2005 +0000
     2.3 @@ -1,10 +1,9 @@
     2.4 +SUBDIRS = icons
     2.5 +
     2.6  AM_CPPFLAGS = -I$(top_srcdir)
     2.7  LDADD = $(top_builddir)/lemon/libemon.la
     2.8  
     2.9  
    2.10 -noinst_DATA = guipixbufs.h
    2.11 -CLEANFILES = $(noinst_DATA)
    2.12 -
    2.13  bin_PROGRAMS = glemon
    2.14  
    2.15  glemon_SOURCES = \
    2.16 @@ -27,27 +26,7 @@
    2.17  	new_map_win.cc \
    2.18  	new_map_win.h \
    2.19  	xymap.h \
    2.20 -	guipixbufs.h
    2.21 +	icons/guipixbufs.h
    2.22  
    2.23  glemon_CXXFLAGS = $(GTK_CFLAGS)
    2.24  glemon_LDFLAGS = $(GTK_LIBS)
    2.25 -
    2.26 -IMAGES = addlink.png addnode.png delete.png \
    2.27 -	editlink.png editnode.png move.png newmap.png
    2.28 -
    2.29 -VARIABLES = \
    2.30 -	gui_icons_addlink $(srcdir)/addlink.png \
    2.31 -	gui_icons_addnode $(srcdir)/addnode.png \
    2.32 -	gui_icons_delete $(srcdir)/delete.png \
    2.33 -	gui_icons_editlink $(srcdir)/editlink.png \
    2.34 -	gui_icons_editnode $(srcdir)/editnode.png \
    2.35 -	gui_icons_move $(srcdir)/move.png \
    2.36 -	gui_icons_newmap $(srcdir)/newmap.png
    2.37 -
    2.38 -
    2.39 -guipixbufs.h: $(IMAGES)
    2.40 -	gdk-pixbuf-csource \
    2.41 -	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    2.42 -	( rm -f guipixbufs.h && false )
    2.43 -
    2.44 -EXTRA_DIST = $(IMAGES) guipixbufs.h
     3.1 Binary file gui/addlink.png has changed
     4.1 Binary file gui/addnode.png has changed
     5.1 Binary file gui/delete.png has changed
     6.1 Binary file gui/editlink.png has changed
     7.1 Binary file gui/editnode.png has changed
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/gui/icons/Makefile.am	Sat Aug 27 09:32:34 2005 +0000
     8.3 @@ -0,0 +1,26 @@
     8.4 +AM_CPPFLAGS = -I$(top_srcdir)
     8.5 +LDADD = $(top_builddir)/lemon/libemon.la
     8.6 +
     8.7 +
     8.8 +noinst_DATA = guipixbufs.h
     8.9 +CLEANFILES = $(noinst_DATA)
    8.10 +
    8.11 +IMAGES = addlink.png addnode.png delete.png \
    8.12 +	editlink.png editnode.png move.png newmap.png
    8.13 +
    8.14 +VARIABLES = \
    8.15 +	gui_icons_addlink $(srcdir)/addlink.png \
    8.16 +	gui_icons_addnode $(srcdir)/addnode.png \
    8.17 +	gui_icons_delete $(srcdir)/delete.png \
    8.18 +	gui_icons_editlink $(srcdir)/editlink.png \
    8.19 +	gui_icons_editnode $(srcdir)/editnode.png \
    8.20 +	gui_icons_move $(srcdir)/move.png \
    8.21 +	gui_icons_newmap $(srcdir)/newmap.png
    8.22 +
    8.23 +
    8.24 +guipixbufs.h: $(IMAGES)
    8.25 +	gdk-pixbuf-csource \
    8.26 +	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    8.27 +	( rm -f guipixbufs.h && false )
    8.28 +
    8.29 +EXTRA_DIST = $(IMAGES) guipixbufs.h
     9.1 Binary file gui/icons/addlink.png has changed
    10.1 Binary file gui/icons/addnode.png has changed
    11.1 Binary file gui/icons/delete.png has changed
    12.1 Binary file gui/icons/editlink.png has changed
    13.1 Binary file gui/icons/editnode.png has changed
    14.1 Binary file gui/icons/move.png has changed
    15.1 Binary file gui/icons/newmap.png has changed
    16.1 --- a/gui/main_win.cc	Sat Aug 27 09:15:59 2005 +0000
    16.2 +++ b/gui/main_win.cc	Sat Aug 27 09:32:34 2005 +0000
    16.3 @@ -1,5 +1,5 @@
    16.4  #include "main_win.h"
    16.5 -#include "guipixbufs.h"
    16.6 +#include "icons/guipixbufs.h"
    16.7  
    16.8  MainWin::MainWin() :
    16.9    mapwin("Map Setup", mapstorage, gd_canvas),
    17.1 Binary file gui/move.png has changed
    18.1 Binary file gui/newmap.png has changed