diff --git a/ChangeLog b/ChangeLog
index c154b2c75..1ba42ca63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-21  Michael Meeks  <michael@ximian.com>
+
+	* sample/Makefile.in: re-factor slightly.
+
 2002-06-21  Mike Kestner <mkestner@speakeasy.net>
 
 	* gtk/*akefile* : lose the gdk-imaging-sharp refs
diff --git a/sample/Makefile.in b/sample/Makefile.in
index fa9971402..cdd65a95d 100755
--- a/sample/Makefile.in
+++ b/sample/Makefile.in
@@ -1,5 +1,9 @@
 MCS=mcs
 
+local_paths=-L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk
+all_assemblies=-r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -r gtk-sharp -r System.Drawing
+
+
 all: linux
 
 windows:
@@ -9,13 +13,13 @@ windows:
 linux: gtk-hello-world.exe button.exe menu.exe
 
 gtk-hello-world.exe: HelloWorld.cs
-	$(MCS) --unsafe -o gtk-hello-world.exe -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -r gtk-sharp HelloWorld.cs
+	$(MCS) --unsafe -o gtk-hello-world.exe $(local_paths) $(all_assemblies) HelloWorld.cs
 
 button.exe: ButtonApp.cs
-	$(MCS) --unsafe -o button.exe -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -r gtk-sharp -r System.Drawing ButtonApp.cs
+	$(MCS) --unsafe -o button.exe $(local_paths) $(all_assemblies) ButtonApp.cs
 
 menu.exe: Menu.cs
-	$(MCS) --unsafe -o menu.exe -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -r gtk-sharp -r System.Drawing Menu.cs
+	$(MCS) --unsafe -o menu.exe $(local_paths) $(all_assemblies) Menu.cs
 
 clean:
 	rm -f *.exe