diff --git a/ChangeLog b/ChangeLog
index 238030feb..28b5f512f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-07  Mike Kestner <mkestner@speakeasy.net>
+
+	* */Makefile.in : Add clean targets. Add -L parms.
+
 2002-05-06  Mike Kestner <mkestner@speakeasy.net>
 
 	* generator/ObjectGen.cs : When generating a ctor(void)
diff --git a/atk/Makefile.in b/atk/Makefile.in
index afc10f2de..521478619 100644
--- a/atk/Makefile.in
+++ b/atk/Makefile.in
@@ -8,11 +8,10 @@ windows:
 linux: atk-sharp.dll
 
 atk-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -o atk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -r glib-sharp -r pango-sharp -o atk-sharp.dll --recurse *.cs
 
-unix:
-	@echo "'make unix' is broken for now."
-	$(CSC) --unsafe --target=library --r=../glib/glib-sharp.dll --r=../pango/pango-sharp.dll --out=atk-sharp.dll --recurse=*.cs
+clean:
+	rm -f *.dll
 
 install: all
 	cp atk-sharp.dll @prefix@/lib
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
index c83769e7f..e38d74163 100755
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -8,10 +8,10 @@ windows:
 linux: gdk-sharp.dll
 
 gdk-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -o gdk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -r glib-sharp -r pango-sharp -r atk-sharp -o gdk-sharp.dll --recurse *.cs
 
-unix:
-	@echo "'make unix' is broken for now."
+clean:
+	rm -f *.dll
 
 install: all
 	cp gdk-sharp.dll @prefix@/lib
diff --git a/generator/makefile b/generator/makefile
index c2c375b4c..3e753bdc8 100644
--- a/generator/makefile
+++ b/generator/makefile
@@ -1,17 +1,4 @@
 MCS=mcs
-SOURCES=BoxedGen.cs \
-	CallbackGen.cs \
-	CodeGenerator.cs \
-	EnumGen.cs \
-	IGeneratable.cs \
-	InterfaceGen.cs \
-	ObjectGen.cs \
-	Parser.cs \
-	SignalHandler.cs \
-	Statistics.cs \
-	StructBase.cs \
-	StructGen.cs \
-	SymbolTable.cs
 
 all: linux
 
@@ -24,8 +11,8 @@ linux: generated-stamp
 generated-stamp: codegen.exe gtkapi.xml
 	mono ./codegen.exe gtkapi.xml && touch generated-stamp
 
-unix:
-	@echo "'make unix' is broken for now."
+clean:
+	rm -f *.exe
 
 install: all
 	@echo "Nothing to install in generator."
diff --git a/glib/Makefile.in b/glib/Makefile.in
index 3a4cc6a5c..cdfa7c467 100755
--- a/glib/Makefile.in
+++ b/glib/Makefile.in
@@ -10,8 +10,8 @@ linux: glib-sharp.dll
 glib-sharp.dll: *.cs generated/*.cs
 	$(MCS) --unsafe --target library -o glib-sharp.dll --recurse *.cs
 
-unix:
-	@echo "'make unix' is broken for now."
+clean:
+	rm -f *.dll
 
 install: all
 	cp glib-sharp.dll @prefix@/lib || exit 1
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 865e3a55f..79c5caf6f 100755
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -1,8 +1,6 @@
 MCS=mcs
 
 all: linux
-	@echo "You must use 'make windows' or 'make unix'."
-	@echo "'make unix' is broken for now."
 
 windows:
 	$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs
@@ -10,10 +8,10 @@ windows:
 linux: gtk-sharp.dll
 
 gtk-sharp.dll: *.cs generated/*.cs
-	$(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll -o gtk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -o gtk-sharp.dll --recurse *.cs
 
-unix:
-	@echo "'make unix' is broken for now."
+clean:
+	rm -f *.dll
 
 install: all
 	cp gtk-sharp.dll @prefix@/lib
diff --git a/makefile b/makefile
index 87c6efae0..df88492fd 100644
--- a/makefile
+++ b/makefile
@@ -18,6 +18,11 @@ linux:
 		(cd $$i; MCS="$(MCS)" make) || exit 1;\
 	done;
 
+clean:
+	for i in $(DIRS); do				\
+		(cd $$i; make clean) || exit 1;	\
+	done;
+
 install:
 	for i in $(DIRS); do				\
 		(cd $$i; make install) || exit 1;	\
diff --git a/pango/Makefile.in b/pango/Makefile.in
index 74a6374de..22912b980 100644
--- a/pango/Makefile.in
+++ b/pango/Makefile.in
@@ -8,10 +8,10 @@ windows:
 linux: pango-sharp.dll
 
 pango-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -o pango-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -r glib-sharp -o pango-sharp.dll --recurse *.cs
 
-unix:
-	@echo "'make unix' is broken for now."
+clean:
+	rm -f *.dll
 
 install: all
 	cp pango-sharp.dll @prefix@/lib
diff --git a/sample/Makefile.in b/sample/Makefile.in
index 852015e72..8c3c68074 100755
--- a/sample/Makefile.in
+++ b/sample/Makefile.in
@@ -14,6 +14,9 @@ gtk-hello-world.exe: HelloWorld.cs
 button.exe: ButtonApp.cs
 	$(MCS) --unsafe -o button.exe -r ../glib/glib-sharp.dll -r ../gtk/gtk-sharp.dll ButtonApp.cs
 
+clean:
+	rm -f *.exe
+
 unix:
 	@echo "'make unix' is broken for now."