Index: libpipi/trunk/ThePimp/Makefile.am
===================================================================
--- libpipi/trunk/ThePimp/Makefile.am	(revision 2874)
+++ libpipi/trunk/ThePimp/Makefile.am	(revision 2875)
@@ -6,10 +6,16 @@
 	$(srcdir)/PictureView.cs \
 	$(srcdir)/gtk-gui/generated.cs \
+	$(srcdir)/MainWindow.cs \
+	$(srcdir)/gtk-gui/ThePimp.MainWindow.cs \
 	$(srcdir)/OpenFile.cs \
 	$(srcdir)/gtk-gui/ThePimp.OpenFile.cs \
 	$(srcdir)/SaveFile.cs \
 	$(srcdir)/gtk-gui/ThePimp.SaveFile.cs \
-	$(srcdir)/MainWindow.cs \
-	$(srcdir)/gtk-gui/MainWindow.cs
+	$(srcdir)/ToolBox.cs \
+	$(srcdir)/gtk-gui/ThePimp.ToolBox.cs
+
+pimp_resources = \
+	gtk-gui/gui.stetic \
+	gtk-gui/objects.xml
 
 if USE_CSHARP
@@ -17,11 +23,13 @@
 endif
 
-EXTRA_DIST = $(pimp_sources)
+EXTRA_DIST = $(pimp_sources) $(pimp_resources)
 
-Pimp.exe: $(pimp_sources)
+Pimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
 	cp ../pipi-sharp/pipi-sharp.dll .
 	cp ../pipi-sharp/pipi-sharp.dll.config .
 	cp ../pipi-sharp/pipi-sharp.dll.mdb .
-	gmcs -debug $(pimp_sources) -out:$@ -lib:./ \
+	gmcs -debug -out:$@ -lib:./ \
+	  $(addprefix $(srcdir)/, $(pimp_sources)) \
+	  $(addprefix -resource:$(srcdir)/, $(pimp_resources)) \
 	  -pkg:gtk-sharp-2.0 -r:Mono.Posix -r:pipi-sharp.dll