--- a/ChangeLog	Wed Apr 23 05:21:01 2008 +0000
+++ b/ChangeLog	Wed Apr 23 06:08:10 2008 +0000
@@ -1,3 +1,16 @@
+2008-04-23  Laszlo (Laca) Peter  <[email protected]>
+
+	* SFEgtkmm-gpp.spec: (new) g++-build gtkmm
+	* base-specs/gtkmm.spec: (new) base spec for gtkmm
+	* patches/gtkmm-01-ignore-defs.diff: (new) copied from JDS spec-files
+	* patches/gtkmm-01-tooltips.diff: (delete) undef'd patch
+	* patches/gtkmm-02-demo.diff: (new) copied from JDS spec-files
+	* patches/gtkmm-02-getc_unlocked.diff: (delete) undef'd patch
+	* patches/gtkmm-03-demo-installation.diff: (new) copied from JDS
+
+2008-04-23  Laszlo (Laca) Peter  <[email protected]>
+
+
 2008-04-23  Laszlo (Laca) Peter  <[email protected]>
 
 	* SFEcairomm-gpp.spec: (new) g++-build cairomm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgtkmm-gpp.spec	Wed Apr 23 06:08:10 2008 +0000
@@ -0,0 +1,105 @@
+#
+#
+# spec file for package SFEgtkmm-gpp
+#
+# includes module(s): gtkmm
+#
+# Copyright 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+%include Solaris.inc
+
+%define cc_is_gcc 1
+%include base.inc
+
+%use gtkmm = gtkmm.spec
+
+Name:                    SFEgtkmm-gpp
+Summary:                 gtkmm - C++ Wrapper for the Gtk+ Library (g++-built)
+Version:                 %{gtkmm.version}
+
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SFEglibmm-gpp
+Requires: SFEcairomm-gpp
+Requires: SUNWgnome-base-libs
+Requires: SUNWlibms
+Requires: SFEsigcpp-gpp
+Requires: SUNWlibC
+Requires: SUNWgccruntime
+BuildRequires: SUNWsigcpp-devel
+BuildRequires: SUNWglibmm-devel
+BuildRequires: SUNWcairomm-devel
+BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SFEsigcpp-gpp-devel
+BuildRequires: SFEglibmm-gpp-devel
+BuildRequires: SFEcairomm-gpp-devel
+
+%package devel
+Summary:                 gtkmm - C++ Wrapper for the Gtk+ Library - developer files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires: %name
+Requires: SUNWgnome-base-libs-devel
+Requires: SFEglibmm-gpp-devel
+Requires: SFEsigcpp-gpp-devel
+Requires: SFEcairomm-gpp-devel
+Requires: SUNWglibmm-devel
+Requires: SUNWcairomm-devel
+Requires: SUNWsigcpp-devel
+
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%gtkmm.prep -d %name-%version
+
+%build
+export CC=gcc
+export CXX=g++
+export CFLAGS="%optflags"
+export LDFLAGS="-L%{_cxx_libdir} -R%{_cxx_libdir}"
+export CXXFLAGS="%gcc_cxx_optflags -D_XPG4_2 -D__EXTENSIONS__"
+export PKG_CONFIG_PATH="%{_cxx_libdir}/pkgconfig"
+%gtkmm.build -d %name-%version
+
+%install
+%gtkmm.install -d %name-%version
+
+# Move demo to demo directory
+#
+install -d $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin
+mv $RPM_BUILD_ROOT%{_bindir}/gtkmm-demo \
+    $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin/gtkmm-gpp-demo
+rm -r $RPM_BUILD_ROOT%{_bindir}
+
+# delete files already included in SUNWgtkmm-devel:
+rm -r $RPM_BUILD_ROOT%{_datadir}
+rm -r $RPM_BUILD_ROOT%{_includedir}
+
+%clean
+#rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_cxx_libdir}
+%{_cxx_libdir}/lib*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_cxx_libdir}
+%dir %attr (0755, root, other) %{_cxx_libdir}/pkgconfig
+%{_cxx_libdir}/pkgconfig/*
+%{_cxx_libdir}/gtkmm*
+%{_cxx_libdir}/gdkmm*
+%dir %attr (0755, root, bin) %{_prefix}/demo
+%dir %attr (0755, root, bin) %{_prefix}/demo/jds
+%dir %attr (0755, root, bin) %{_prefix}/demo/jds/bin
+%{_prefix}/demo/jds/bin/gtkmm-gpp-demo
+
+
+%changelog
+* Wed Apr 23 2008 - [email protected]
+- create, re-work from SUNWgtkmm.spec to build with g++

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/gtkmm.spec	Wed Apr 23 06:08:10 2008 +0000
@@ -0,0 +1,81 @@
+#
+# spec file for package gtkmm
+#
+# Copyright 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+Name:         gtkmm
+License:      LGPL
+Group:        System/Libraries
+Version:      2.12.4
+Release:      1
+Distribution: Java Desktop System
+Vendor:       Sun Microsystems, Inc.
+Summary:      gtkmm - C++ Interfaces for GTK+ and GNOME
+Source:       http://download.gnome.org/sources/gtkmm/2.12/gtkmm-%{version}.tar.bz2
+
+#date:2008-02-14 owner:bewitche type:feature  
+Patch1:       gtkmm-01-ignore-defs.diff
+# date:2008-02-14 owner:bewitche type:bug bugzilla:516600
+Patch2:	      gtkmm-02-demo.diff  
+# date:2008-02-14 owner:bewitche type:bug bugzilla:516602
+Patch3:       gtkmm-03-demo-installation.diff
+# date:2008-02-18 owner:dcarbery type:bug bugzilla:423990
+Patch4:       glibmm-01-m4-macro.diff
+URL:          http://www.gtkmm.org/
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n gtkmm-%version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+    CPUS=1
+fi
+
+# background.jpg is required by gtkmm-demo, but not in the right directory
+# we simply copy the file into the proper directory
+cp ./demos/background.jpg ./demos/gtk-demo
+
+automake --add-missing
+autoconf
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+            --libdir=%{_cxx_libdir}              \
+            --libexecdir=%{_libexecdir}      \
+            --sysconfdir=%{_sysconfdir}
+make -j$CPUS 
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+mv $RPM_BUILD_ROOT%{_bindir}/demo $RPM_BUILD_ROOT%{_bindir}/gtkmm-demo
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*
+
+
+%changelog
+* Fri Fe 22 2008 - [email protected]
+- Add glibmm-02-m4-macro to fix #423990. Use glibmm patch as issue is identical.
+* Thu Feb 14 2008 - [email protected]
+- Add patches gtkmm-02-demo, gtkmm-03-demo-installation to deliver gtkmm-demo
+  on /usr/demo/jds/bin and resource files on /usr/share/gtkmm-2.4/demo
+* Thu Feb 14 2008 - [email protected]
+- Add patch gtkmm-01-ignore-defs to remove the build of defs files since they
+  are delivered with tarball and libglibmm_generate_extra_defs.so is not 
+  delivered. We have raise this issue to module owner, and will remove the 
+  patch if the module owner agree to remove .def file from tarball
+* Tue Jan 29 2008 - [email protected]
+- create

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtkmm-01-ignore-defs.diff	Wed Apr 23 06:08:10 2008 +0000
@@ -0,0 +1,23 @@
+--- gtkmm-2.12.4/tools/Makefile.am.orig	2008-02-13 14:16:20.355643000 +0800
++++ gtkmm-2.12.4/tools/Makefile.am	2008-02-13 14:16:37.105667000 +0800
+@@ -1,7 +1,7 @@
+ 
+ include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment
+ 
+-SUBDIRS = m4 extra_defs_gen
++SUBDIRS = m4 
+ 
+ EXTRA_DIST = Makefile_list_of_sources.am_fragment README TODO
+ 
+--- gtkmm-2.12.4/configure.in.orig	2008-02-13 14:15:41.931217000 +0800
++++ gtkmm-2.12.4/configure.in	2008-02-13 14:16:00.032913000 +0800
+@@ -530,8 +530,7 @@
+       pango/pangomm/private/Makefile
+ 
+   tools/Makefile
+-    tools/m4/Makefile
+-    tools/extra_defs_gen/Makefile
++    tools/m4/Makefile   
+ ])
+ 
+ AC_CONFIG_FILES([

--- a/patches/gtkmm-01-tooltips.diff	Wed Apr 23 05:21:01 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
---- trunk/gtk/src/toolbar.ccg	2007/07/09 09:57:32	868
-+++ trunk/gtk/src/toolbar.ccg	2007/07/12 12:41:04	869
-@@ -92,5 +92,13 @@
-   gtk_toolbar_set_drop_highlight_item(gobj(), 0, 0);
- }
- 
-+#ifndef GTKMM_DISABLE_DEPRECATED
-+Tooltips* Toolbar::get_tooltips_object() const
-+{
-+  //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
-+  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-+}
-+#endif //GTKMM_DISABLE_DEPRECATED
-+
- } // namespace Gtk
- 
---- trunk/gtk/src/toolbar.hg	2007/07/09 09:57:32	868
-+++ trunk/gtk/src/toolbar.hg	2007/07/12 12:41:04	869
-@@ -118,9 +118,11 @@
-   _IGNORE_SIGNAL("move_focus")
-   _IGNORE_SIGNAL("focus_home_or_end")
- 
--  //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
--  
--  _MEMBER_GET(tooltips_object, tooltips, Tooltips*, GtkTooltips*)
-+  #ifndef GTKMM_DISABLE_DEPRECATED
-+  //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-+  ///@deprecated Use the Gtk::Tooltip API instead. 
-+  Tooltips* get_tooltips_object() const;
-+  #endif //GTKMM_DISABLE_DEPRECATED
-   
-   //This is probably the same as Container::children().size(), which is deprecated anyway?
-   //_MEMBER_GET(num_children, num_children, int, gint)
---- gtkmm-2.10.11/gtk/gtkmm/toolbar.cc	2007/07/09 09:57:32	868
-+++ gtkmm-2.10.11/gtk/gtkmm/toolbar.cc	2007/07/12 12:41:04	869
-@@ -98,6 +98,14 @@
-   gtk_toolbar_set_drop_highlight_item(gobj(), 0, 0);
- }
- 
-+#ifndef GTKMM_DISABLE_DEPRECATED
-+Tooltips* Toolbar::get_tooltips_object() const
-+{
-+  //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
-+  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-+}
-+#endif //GTKMM_DISABLE_DEPRECATED
-+
- } // namespace Gtk
- 
- 
-@@ -564,11 +572,6 @@
- gtk_toolbar_set_drop_highlight_item(gobj(), (tool_item).gobj(), index); 
- }
- 
-- Tooltips* Toolbar::get_tooltips_object() const
--{
--  return Glib::wrap(gobj()->tooltips);
--}
-- 
- 
- Glib::SignalProxy1< void,Orientation > Toolbar::signal_orientation_changed()
- {
---- gtkmm-2.10.11/gtk/gtkmm/toolbar.h	2007/07/09 09:57:32	868
-+++ gtkmm-2.10.11/gtk/gtkmm/toolbar.h	2007/07/12 12:41:04	869
-@@ -324,9 +324,11 @@
-   Glib::SignalProxy3< bool,int,int,int > signal_popup_context_menu();
- 
-   
--  //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
--  
--   Tooltips* get_tooltips_object() const;
-+  #ifndef GTKMM_DISABLE_DEPRECATED
-+  //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-+  ///@deprecated Use the Gtk::Tooltip API instead.
-+  Tooltips* get_tooltips_object() const;
-+  #endif //GTKMM_DISABLE_DEPRECATED
-    
-   //This is probably the same as Container::children().size(), which is deprecated anyway?
-   //_MEMBER_GET(num_children, num_children, int, gint)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtkmm-02-demo.diff	Wed Apr 23 06:08:10 2008 +0000
@@ -0,0 +1,131 @@
+--- gtkmm-2.12.4/demos/gtk-demo/demowindow.cc.orig	2008-02-13 15:55:23.109710000 +0800
++++ gtkmm-2.12.4/demos/gtk-demo/demowindow.cc	2008-02-13 16:01:08.123892000 +0800
+@@ -31,6 +31,7 @@
+ #include <cctype>
+ #include <cerrno>
+ #include <stdio.h>
++#include <demo-common.h>
+ 
+ #ifdef NEED_FLOCKFILE_PROTO
+ extern "C" void flockfile (FILE *);
+@@ -276,7 +277,7 @@
+     FILE* file = fopen (filename.c_str(), "r");
+     if (!file)
+     {
+-      std::string installed = /* DEMOCODEDIR + G_DIR_SEPARATOR_S + */ filename;
++      std::string installed = demo_find_file(filename);
+       file = fopen (installed.c_str(), "r");
+     }
+ 
+--- gtkmm-2.12.4/demos/gtk-demo/example_images.cc.orig	2008-02-13 16:04:38.385202000 +0800
++++ gtkmm-2.12.4/demos/gtk-demo/example_images.cc	2008-02-13 16:07:01.986048000 +0800
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include <gtkmm.h>
++#include "demo-common.h"
+ 
+ class Example_Images : public Gtk::Window
+ {
+@@ -71,7 +72,7 @@
+   m_Alignment_Image.add(m_Frame_Image);
+   m_VBox.pack_start(m_Alignment_Image, Gtk::PACK_SHRINK);
+ 
+-  Gtk::Image* pImage = Gtk::manage(new Gtk::Image("gtk-logo-rgb.gif"));
++  Gtk::Image* pImage = Gtk::manage(new Gtk::Image(demo_find_file("gtk-logo-rgb.gif")));
+   m_Frame_Image.add(*pImage);
+ 
+   /* Animation */
+@@ -87,7 +88,7 @@
+   m_Alignment_Animation.add(m_Frame_Animation);
+   m_VBox.pack_start(m_Alignment_Animation, Gtk::PACK_SHRINK);
+ 
+-  pImage = Gtk::manage(new Gtk::Image("floppybuddy.gif"));
++  pImage = Gtk::manage(new Gtk::Image(demo_find_file("floppybuddy.gif")));
+   m_Frame_Animation.add(*pImage);
+ 
+   /* Progressive */
+@@ -254,13 +255,13 @@
+     #ifdef GLIBMM_EXCEPTIONS_ENABLED
+     try
+     {
+-      m_image_stream = Glib::IOChannel::create_from_file("alphatest.png", "r");
++      m_image_stream = Glib::IOChannel::create_from_file(demo_find_file("alphatest.png"), "r");
+     }
+     catch(const Glib::Error& error)
+     {
+     #else
+     std::auto_ptr<Glib::Error> error;
+-    m_image_stream = Glib::IOChannel::create_from_file("alphatest.png", "r", error);
++    m_image_stream = Glib::IOChannel::create_from_file(demo_find_file("alphatest.png)", "r", error);
+     if(error.get())
+     {
+     #endif //GLIBMM_EXCEPTIONS_ENABLED
+--- gtkmm-2.12.4/demos/gtk-demo/example_pixbufs.cc.orig	2008-02-13 16:07:58.605417000 +0800
++++ gtkmm-2.12.4/demos/gtk-demo/example_pixbufs.cc	2008-02-13 16:10:11.517893000 +0800
+@@ -17,6 +17,7 @@
+ #include <gtkmm.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include "demo-common.h"
+ 
+ #define FRAME_DELAY 50
+ 
+@@ -109,10 +110,10 @@
+   std::string filename_background = BACKGROUND_NAME;
+ 
+   #ifdef GLIBMM_EXCEPTIONS_ENABLED
+-  m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(filename_background);
++  m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(demo_find_file(filename_background));
+   #else
+   std::auto_ptr<Glib::Error> error;
+-  m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(filename_background, error);
++  m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(demo_find_file(filename_background), error);
+   #endif //GLIBMM_EXCEPTIONS_ENABLED
+ 
+   m_back_width = m_refPixbuf_Background->get_width();
+@@ -123,10 +124,10 @@
+     std::string filename = image_names[i];
+ 
+     #ifdef GLIBMM_EXCEPTIONS_ENABLED
+-    Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(filename);
++    Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(demo_find_file(filename));
+     #else
+     std::auto_ptr<Glib::Error> error;
+-    Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(filename, error);
++    Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(demo_find_file(filename), error);
+     #endif //GLIBMM_EXCEPTIONS_ENABLED
+ 
+     m_images[i] = pixbuf;
+--- gtkmm-2.12.4/demos/gtk-demo/example_textview.cc.orig	2008-02-13 16:13:08.027949000 +0800
++++ gtkmm-2.12.4/demos/gtk-demo/example_textview.cc	2008-02-13 16:14:55.252060000 +0800
+@@ -10,6 +10,7 @@
+ #include "gtkmm.h"
+ #include "gtk/gtkstock.h"
+ #include "gtk/gtk.h"
++#include "demo-common.h"
+ 
+ class Window_EasterEgg : public Gtk::Window
+ {
+@@ -237,10 +238,10 @@
+ void Example_TextView::insert_text(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
+ {
+   #ifdef GLIBMM_EXCEPTIONS_ENABLED
+-  Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file("./gtk-logo-rgb.gif");
++  Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file(demo_find_file("gtk-logo-rgb.gif"));
+   #else
+   std::auto_ptr<Glib::Error> error;
+-  Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file("./gtk-logo-rgb.gif", error);
++  Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file(demo_find_file("gtk-logo-rgb.gif"), error);
+   #endif //GLIBMM_EXCEPTIONS_ENABLED
+ 
+   if(!refPixbuf)
+@@ -474,7 +475,7 @@
+     }
+     else if (i == 3)
+       {
+-        pWidget = Gtk::manage( new Gtk::Image("./floppybuddy.gif") );
++        pWidget = Gtk::manage( new Gtk::Image(demo_find_file("floppybuddy.gif")) );
+       }
+     else if (i == 4)
+     {

--- a/patches/gtkmm-02-getc_unlocked.diff	Wed Apr 23 05:21:01 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gtkmm-2.10.11.orig/configure.in	2007年  9月 19日 三 17:49:18
-+++ gtkmm-2.10.11/configure.in	2007年  9月 19日 三 19:49:09
-@@ -175,7 +175,8 @@
- AC_MSG_CHECKING([for getc_unlocked])
- AC_TRY_LINK([
- #include <stdio.h>],[
--getc_unlocked (NULL);],[
-+FILE *foo = NULL;
-+getc_unlocked (foo);],[
-   AC_MSG_RESULT(yes)
-   AC_DEFINE(HAVE_GETC_UNLOCKED, 1,
-     [Define to 1 if you have the `getc_unlocked' function.])],[

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtkmm-03-demo-installation.diff	Wed Apr 23 06:08:10 2008 +0000
@@ -0,0 +1,74 @@
+--- gtkmm-2.12.4/demos/gtk-demo/Makefile.am.old	2008-02-13 17:44:11.675947000 +0800
++++ gtkmm-2.12.4/demos/gtk-demo/Makefile.am	2008-02-13 17:43:06.423606000 +0800
+@@ -1,18 +1,39 @@
+ 
+-pixmap_files = \
+-	alphatest.png		\
+-	apple-red.png		\
+-	gnome-applets.png	\
+-	gnome-calendar.png	\
+-	gnome-foot.png		\
+-	gnome-gimp.png		\
+-	gnome-gmush.png		\
+-	gnome-gsame.png		\
+-	gnu-keys.png		\
+-	floppybuddy.gif		\
+-	gtk-logo-rgb.gif \
+-	gnome-fs-regular.png \
+-	gnome-fs-directory.png
++demos =					\
++	example_appwindow.cc			\
++	example_buttonbox.cc			\
++	example_change_display.cc		\
++	example_colorsel.cc 			\
++	example_dialog.cc 			\
++	example_drawingarea.cc 			\
++	example_images.cc 			\
++	example_iconview.cc			\
++	example_menus.cc 			\
++	example_panes.cc			\
++	example_pixbufs.cc			\
++	example_sizegroup.cc 			\
++	example_stockbrowser.cc			\
++	example_uimanager.cc			\
++	example_textview.cc 			\
++	example_treeview_editable_cells.cc	\
++	example_treeview_liststore.cc		\
++	example_treeview_treestore.cc 		
++
++pixmap_files = 				\
++	alphatest.png				\
++	apple-red.png				\
++	gnome-applets.png			\
++	gnome-calendar.png			\
++	gnome-foot.png				\
++	gnome-gimp.png				\
++	gnome-gmush.png				\
++	gnome-gsame.png				\
++	gnu-keys.png				\
++	floppybuddy.gif				\
++	gtk-logo-rgb.gif 			\
++	gnome-fs-regular.png 			\
++	gnome-fs-directory.png			\
++	background.jpg
+ 
+ 
+ EXTRA_DIST = $(pixmap_files)
+@@ -46,11 +67,9 @@
+        $(GTKMM_LIBS)
+ 
+ #List of source files needed to build the executable:
+-demo_SOURCES = demowindow.h demowindow.cc main.cc demos.h textwidget.h textwidget.cc \
+-               example_appwindow.cc example_buttonbox.cc example_change_display.cc example_colorsel.cc \
+-               example_dialog.cc example_drawingarea.cc \
+-               example_images.cc example_iconview.cc example_menus.cc example_panes.cc example_pixbufs.cc example_sizegroup.cc \
+-               example_stockbrowser.cc example_uimanager.cc example_textview.cc \
+-               example_treeview_editable_cells.cc example_treeview_liststore.cc example_treeview_treestore.cc \
+-	       demo-common.cc demo-common.h
+-	       
++demo_SOURCES = $(demos) demowindow.h demowindow.cc main.cc demos.h textwidget.h textwidget.cc demo-common.cc demo-common.h
++
++
++	
++       	       
++democode_DATA = $(pixmap_files) $(demos)