Changeset 76:76f4f2ae0e7d in glemon-0.x

Timestamp:

08/27/05 11:32:34 (18 years ago)

Author:

Alpar Juttner

Branch:

gui

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk/gui@2172

Message:

Dependency problem (guipixbufs.h) is solved.

Files:

• Makefile.am (modified) (2 diffs)
• addlink.png (deleted)
• addnode.png (deleted)
• delete.png (deleted)
• editlink.png (deleted)
• editnode.png (deleted)
• icons/Makefile.am (added)
• icons/addlink.png (added)
• icons/addnode.png (added)
• icons/delete.png (added)
• icons/editlink.png (added)
• icons/editnode.png (added)
• icons/move.png (added)
• icons/newmap.png (added)
• main_win.cc (modified) (1 diff)
• move.png (deleted)
• newmap.png (deleted)

Makefile.am

@@ +1 @@
+SUBDIRS = icons
+
 AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_builddir)/lemon/libemon.la
 
-
-noinst_DATA = guipixbufs.h
-CLEANFILES = $(noinst_DATA)
 
 bin_PROGRAMS = glemon
@@ -28 +27 @@
         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

main_win.cc

@@ -1 +1 @@
 #include "main_win.h"
-#include "guipixbufs.h"
+#include "icons/guipixbufs.h"
 
 MainWin::MainWin() :