diff --git a/ChangeLog b/ChangeLog
index 22586c04..6a3e17b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-02-05  Ovidiu Predescu  <ovidiu@net-community.com>
+
+	* brain.make (GUI_LIBS): Changed the order of the gui and gmodel
+	libraries.
+	* library.make (internal-library-all): Added before-all and after-all
+	in the list of dependencies. The same thing should be added in the
+	other makefile fragments, maybe using a more general way.
+	* rules.make (internal-clean): Remove directories that have been
+	changed too.
+	* tool.make (internal-tool-install): Add internal-tool-all to the list
+	of dependencies.
+
 Wed Feb  4 09:01:16 1998  Adam Fedor  <fedor@ultra.doc.com>
 
 	* target.make: Add TARGET_SYSTEM_LIBS for irix OS.
diff --git a/brain.make b/brain.make
index 69d09712..d988edda 100644
--- a/brain.make
+++ b/brain.make
@@ -125,7 +125,7 @@ GUI_LIBS =
 #
 ifeq ($(GUI_LIB),gnu)
 GUI_LDFLAGS =
-GUI_LIBS = -lgmodel -lgnustep-gui -lFoundationExt
+GUI_LIBS = -lgnustep-gui -lgmodel
 GUI_DEFINE = -DGNU_GUI_LIBRARY=1
 endif
 
diff --git a/library.make b/library.make
index e251b015..cfac0071 100644
--- a/library.make
+++ b/library.make
@@ -83,9 +83,9 @@ endif
 #
 # Compilation targets
 #
-internal-library-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
+internal-library-all:: before-all before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
 		$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) import-library \
-		after-$(TARGET)-all
+		after-$(TARGET)-all after-all
 
 $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
 	$(LIB_LINK_CMD)
diff --git a/rules.make b/rules.make
index 7b1a2386..f573b140 100644
--- a/rules.make
+++ b/rules.make
@@ -89,7 +89,7 @@ after-uninstall::
 before-clean::
 
 internal-clean::
-	rm -f *~
+	rm -rf *~
 
 after-clean::
 
diff --git a/tool.make b/tool.make
index a6714ffe..3495eefb 100644
--- a/tool.make
+++ b/tool.make
@@ -80,7 +80,7 @@ before-$(TARGET)-all::
 
 after-$(TARGET)-all::
 
-internal-tool-install:: internal-install-dirs install-tool
+internal-tool-install:: internal-tool-all internal-install-dirs install-tool
 
 internal-install-dirs::
 	$(GNUSTEP_MAKEFILES)/mkinstalldirs $(TOOL_INSTALLATION_DIR)