[Lemon-commits] [lemon_svn] ladanyi: r2434 - in hugo/trunk/gui: . icons

[Lemon SVN]

Author: ladanyi
Date: Sun Dec 18 02:51:03 2005
New Revision: 2434

Removed:
   hugo/trunk/gui/icons/Makefile.am
Modified:
   hugo/trunk/gui/   (props changed)
   hugo/trunk/gui/Makefile.am
   hugo/trunk/gui/main_win.cc

Log:
Added guipixbufs.h to BUILT_SOURCES. This solves 'make dist' problems.


Modified: hugo/trunk/gui/Makefile.am
==============================================================================
--- hugo/trunk/gui/Makefile.am	(original)
+++ hugo/trunk/gui/Makefile.am	Sun Dec 18 02:51:03 2005
@@ -1,10 +1,9 @@
-SUBDIRS = icons
-
 AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_builddir)/lemon/libemon.la
 
-
 bin_PROGRAMS = glemon
+BUILT_SOURCES = guipixbufs.h
+CLEANFILES = guipixbufs.h
 
 glemon_SOURCES = \
 	all_include.h \
@@ -33,8 +32,32 @@
 	gui_writer.h \
 	gui_writer.cc \
 	xml.h \
-	icons/guipixbufs.h
-
+	guipixbufs.h
 
 glemon_CXXFLAGS = $(GTK_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS)
+
+IMAGES = \
+	icons/addlink.png \
+	icons/addnode.png \
+	icons/delete.png \
+	icons/editlink.png \
+	icons/editnode.png \
+	icons/move.png \
+	icons/newmap.png
+
+VARIABLES = \
+	gui_icons_addlink $(srcdir)/icons/addlink.png \
+	gui_icons_addnode $(srcdir)/icons/addnode.png \
+	gui_icons_delete $(srcdir)/icons/delete.png \
+	gui_icons_editlink $(srcdir)/icons/editlink.png \
+	gui_icons_editnode $(srcdir)/icons/editnode.png \
+	gui_icons_move $(srcdir)/icons/move.png \
+	gui_icons_newmap $(srcdir)/icons/newmap.png
+
+guipixbufs.h: $(IMAGES)
+	gdk-pixbuf-csource \
+	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
+	( rm -f guipixbufs.h && false )
+
+EXTRA_DIST = $(IMAGES) guipixbufs.h

Modified: hugo/trunk/gui/main_win.cc
==============================================================================
--- hugo/trunk/gui/main_win.cc	(original)
+++ hugo/trunk/gui/main_win.cc	Sun Dec 18 02:51:03 2005
@@ -1,5 +1,5 @@
 #include "main_win.h"
-#include "icons/guipixbufs.h"
+#include "guipixbufs.h"
 
 MainWin::MainWin()
 {