[Lemon-commits] [lemon_svn] alpar: r2172 - in hugo/trunk: . gui gui/icons

[Lemon SVN]

Author: alpar
Date: Sat Aug 27 11:32:34 2005
New Revision: 2172

Added:
   hugo/trunk/gui/icons/Makefile.am
      - copied, changed from r2169, /hugo/trunk/gui/Makefile.am
   hugo/trunk/gui/icons/addlink.png
      - copied unchanged from r2169, /hugo/trunk/gui/addlink.png
   hugo/trunk/gui/icons/addnode.png
      - copied unchanged from r2169, /hugo/trunk/gui/addnode.png
   hugo/trunk/gui/icons/delete.png
      - copied unchanged from r2169, /hugo/trunk/gui/delete.png
   hugo/trunk/gui/icons/editlink.png
      - copied unchanged from r2169, /hugo/trunk/gui/editlink.png
   hugo/trunk/gui/icons/editnode.png
      - copied unchanged from r2169, /hugo/trunk/gui/editnode.png
   hugo/trunk/gui/icons/move.png
      - copied unchanged from r2169, /hugo/trunk/gui/move.png
   hugo/trunk/gui/icons/newmap.png
      - copied unchanged from r2169, /hugo/trunk/gui/newmap.png
Removed:
   hugo/trunk/gui/addlink.png
   hugo/trunk/gui/addnode.png
   hugo/trunk/gui/delete.png
   hugo/trunk/gui/editlink.png
   hugo/trunk/gui/editnode.png
   hugo/trunk/gui/move.png
   hugo/trunk/gui/newmap.png
Modified:
   hugo/trunk/configure.ac
   hugo/trunk/gui/Makefile.am
   hugo/trunk/gui/main_win.cc

Log:
Dependency problem (guipixbufs.h) is solved.

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Sat Aug 27 11:32:34 2005
@@ -53,6 +53,7 @@
 demo/Makefile
 test/Makefile
 gui/Makefile
+gui/icons/Makefile
 ])
 
 AC_OUTPUT

Modified: hugo/trunk/gui/Makefile.am
==============================================================================
--- hugo/trunk/gui/Makefile.am	(original)
+++ hugo/trunk/gui/Makefile.am	Sat Aug 27 11:32:34 2005
@@ -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

Copied: hugo/trunk/gui/icons/Makefile.am (from r2169, /hugo/trunk/gui/Makefile.am)
==============================================================================
--- /hugo/trunk/gui/Makefile.am	(original)
+++ hugo/trunk/gui/icons/Makefile.am	Sat Aug 27 11:32:34 2005
@@ -5,33 +5,6 @@
 noinst_DATA = guipixbufs.h
 CLEANFILES = $(noinst_DATA)
 
-bin_PROGRAMS = glemon
-
-glemon_SOURCES = \
-	all_include.h \
-	graph_displayer_canvas.cc \
-	graph_displayer_canvas-edge.cc \
-	graph_displayer_canvas-node.cc \
-	graph_displayer_canvas-event.cc \
-	graph_displayer_canvas-zoom.cc \
-	graph_displayer_canvas.h \
-	graph-displayer.cc \
-	main_win.cc \
-	main_win.h \
-	mapstorage.cc \
-	mapstorage.h \
-	map_win.cc \
-	map_win.h \
-	broken_edge.cc \
-	broken_edge.h \
-	new_map_win.cc \
-	new_map_win.h \
-	xymap.h \
-	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
 

Modified: hugo/trunk/gui/main_win.cc
==============================================================================
--- hugo/trunk/gui/main_win.cc	(original)
+++ hugo/trunk/gui/main_win.cc	Sat Aug 27 11:32:34 2005
@@ -1,5 +1,5 @@
 #include "main_win.h"
-#include "guipixbufs.h"
+#include "icons/guipixbufs.h"
 
 MainWin::MainWin() :
   mapwin("Map Setup", mapstorage, gd_canvas),