From 2f5809598e273e019fda624a69806149a46e6404 Mon Sep 17 00:00:00 2001
From: Emanuele Aliberti <ea@iol.it>
Date: Sat, 28 Jul 2001 08:02:05 +0000
Subject: [PATCH] cmd, more, tee, y, notevil, sysutils linked to msvcrt.dll.

svn path=/trunk/; revision=2111
---
 rosapps/cmd/makefile      |  2 +-
 rosapps/cmdutils/makefile |  6 ++---
 rosapps/notevil/makefile  |  4 ++--
 rosapps/sysutils/makefile | 48 ++++++++++++++++-----------------------
 4 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/rosapps/cmd/makefile b/rosapps/cmd/makefile
index 627f908da6a..2f6d45b5d5e 100644
--- a/rosapps/cmd/makefile
+++ b/rosapps/cmd/makefile
@@ -18,7 +18,7 @@ CLEAN_FILES = *.o cmd.exe cmd.sym cmd.coff
 
 
 cmd.exe: $(OBJECTS)
-	$(CC) $(OBJECTS) -lkernel32 -lcrtdll -luser32 -o cmd.exe
+	$(CC) $(OBJECTS) -lkernel32 -lmsvcrt -luser32 -o cmd.exe
 	$(NM) --numeric-sort cmd.exe > cmd.sym
 
 
diff --git a/rosapps/cmdutils/makefile b/rosapps/cmdutils/makefile
index ea91aae0af4..4d1b7c4f8b2 100644
--- a/rosapps/cmdutils/makefile
+++ b/rosapps/cmdutils/makefile
@@ -10,15 +10,15 @@ all: $(TARGET)
 CLEAN_FILES = *.o *.exe *.sym *.coff
 
 more.exe: more.o more.coff
-	$(CC) more.o -lkernel32 -lcrtdll -o more.exe more.coff
+	$(CC) more.o -lkernel32 -lmsvcrt -o more.exe more.coff
 	$(NM) --numeric-sort more.exe > more.sym
 
 tee.exe: tee.o tee.coff
-	$(CC) tee.o -lkernel32 -lcrtdll -o tee.exe tee.coff
+	$(CC) tee.o -lkernel32 -lmsvcrt -o tee.exe tee.coff
 	$(NM) --numeric-sort tee.exe > tee.sym
 
 y.exe: y.o y.coff
-	$(CC) y.o -lkernel32 -lcrtdll -o y.exe y.coff
+	$(CC) y.o -lkernel32 -lmsvcrt -o y.exe y.coff
 	$(NM) --numeric-sort y.exe > y.sym
 
 clean: $(CLEAN_FILES:%=%_clean)
diff --git a/rosapps/notevil/makefile b/rosapps/notevil/makefile
index 230406f5926..04bfcd0dfe6 100644
--- a/rosapps/notevil/makefile
+++ b/rosapps/notevil/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.3 2000/09/12 23:21:20 ea Exp $
+# $Id: makefile,v 1.4 2001/07/28 08:02:05 ea Exp $
 #
 # ReactOS makefile for notevil
 # Compiler: egcs 1.1.2
@@ -23,7 +23,7 @@ $(TARGET).exe: $(OBJECTS)
 		-o $(TARGET).exe \
 		-lkernel32 \
 		-luser32 \
-		-lcrtdll
+		-lmsvcrt
 	$(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym
 
 $(TARGET).coff: $(TARGET).rc
diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile
index 24a3cb2c448..88cf1a77e00 100644
--- a/rosapps/sysutils/makefile
+++ b/rosapps/sysutils/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.8 2001/01/13 18:17:17 ea Exp $
+# $Id: makefile,v 1.9 2001/07/28 08:02:05 ea Exp $
 #
 # ReactOS System Utilities
 #
@@ -21,10 +21,13 @@
 # 2000-08-4 (ea)
 #	Added ldd.c; removed login.c
 #
-BASE_CFLAGS = -I../../reactos/include
+PATH_TO_TOP=..
+PATH_TO_CVSROOT=../$(PATH_TO_TOP)
+
+BASE_CFLAGS = -I$(PATH_TO_CVSROOT)/reactos/include
 
 
-ROS_DIR=../../reactos
+ROS_DIR=$(PATH_TO_CVSROOT)/reactos
 ROS_INC=$(ROS_DIR)/include
 ROS_LIB=$(ROS_DIR)/lib
 IMPORT_NTDLL=$(ROS_LIB)/ntdll/ntdll.a
@@ -32,16 +35,15 @@ IMPORT_FMIFS=$(ROS_LIB)/fmifs/fmifs.a
 IMPORT_KERNEL32=$(ROS_LIB)/kernel32/kernel32.a
 IMPORT_ADVAPI32=$(ROS_LIB)/advapi32/advapi32.a
 IMPORT_USER32=$(ROS_LIB)/user32/user32.a
-IMPORT_CRTDLL=$(ROS_LIB)/crtdll/crtdll.a
+IMPORT_MSVCRT=$(ROS_LIB)/msvcrt/msvcrt.a
 
 TARGET=\
-	chklib.exe	\
-	qsi.exe		\
-	ldd.exe		\
-	pedump.exe	\
-	shutdown.exe	\
-	chkdsk.exe	\
-	format.exe	\
+	chklib$(EXE_POSTFIX)	\
+	ldd$(EXE_POSTFIX)	\
+	pedump$(EXE_POSTFIX)	\
+	shutdown$(EXE_POSTFIX)	\
+	chkdsk$(EXE_POSTFIX)	\
+	format$(EXE_POSTFIX)	\
 	regexpl/regexpl$(EXE_POSTFIX)
 
 all: $(TARGET)
@@ -57,7 +59,7 @@ chkdsk.exe: chkdsk.o win32err.o wmain.o chkdsk.coff
 		chkdsk.coff		\
 		$(IMPORT_FMIFS)		\
 		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o chkdsk.exe 
 	$(NM) --numeric-sort chkdsk.exe > chkdsk.sym
 
@@ -69,7 +71,7 @@ format.exe: format.o win32err.o wmain.o format.coff
 		format.coff		\
 		$(IMPORT_FMIFS)		\
 		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o format.exe
 	$(NM) --numeric-sort format.exe > format.sym
 
@@ -81,7 +83,7 @@ chklib.exe: chklib.o win32err.o chklib.coff
 		win32err.o		\
 		chklib.coff		\
 		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o chklib.exe
 	$(NM) --numeric-sort chklib.exe > chklib.sym
 
@@ -93,29 +95,17 @@ shutdown.exe: shutdown.o win32err.o shutdown.coff
 		shutdown.coff		\
 		$(IMPORT_KERNEL32)	\
 		$(IMPORT_USER32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o shutdown.exe
 	$(NM) --numeric-sort shutdown.exe > shutdown.sym
 
-qsi.exe: qsi.o qsi.coff
-	$(CC) \
-		qsi.o			\
-		qsi.coff		\
-		$(IMPORT_NTDLL)		\
-		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
-		-o qsi.exe
-	$(NM) --numeric-sort qsi.exe > qsi.sym
-
-qsi.o: qsi.c $(ROS_INC)/ddk/zwtypes.h
-
 pedump.exe: pedump.o pedump.coff
 	$(CC) \
 		pedump.o		\
 		pedump.coff		\
 		$(IMPORT_NTDLL)		\
 		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o pedump.exe
 	$(NM) --numeric-sort pedump.exe > pedump.sym
 
@@ -127,7 +117,7 @@ ldd.exe: ldd.o win32err.o ldd.coff
 		win32err.o		\
 		ldd.coff		\
 		$(IMPORT_KERNEL32)	\
-		$(IMPORT_CRTDLL)	\
+		$(IMPORT_MSVCRT)	\
 		-o ldd.exe
 	$(NM) --numeric-sort ldd.exe > ldd.sym