From ce562b2ba030adf24101cc7d9c41e02f6478ddbc Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Tue, 27 May 2003 19:21:14 +0000
Subject: [PATCH] - Linked the string library to ntoskrnl.

svn path=/trunk/; revision=4771
---
 reactos/ntoskrnl/Makefile      | 16 ++++++++++------
 reactos/ntoskrnl/Makefile.i386 |  6 +-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 757206009f7..c9f4265f1a3 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.95 2003/05/21 15:06:33 ekohl Exp $
+# $Id: Makefile,v 1.96 2003/05/27 19:21:14 hbirr Exp $
 #
 # ReactOS Operating System
 #
@@ -92,9 +92,7 @@ OBJECTS_RTL = \
 	rtl/math.o \
 	rtl/mem.o \
 	rtl/memchr.o \
-	rtl/memcpy.o \
 	rtl/memmove.o \
-	rtl/memset.o \
 	rtl/message.o \
 	rtl/nls.o \
 	rtl/purecall.o \
@@ -499,7 +497,7 @@ OBJECTS := \
 	$(OBJECTS_RESOURCE)
 
 
-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a  
 	$(CC) \
 		-Wl,-T,ntoskrnl.lnk \
 		-nostartfiles \
@@ -513,6 +511,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
@@ -535,10 +534,11 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,temp.exp \
 		$(TARGETNAME).o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) temp.exp
 
-$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
+$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a
 	- $(CC) \
 		-Wl,-T,$(LINKER_SCRIPT) \
 		-nostartfiles \
@@ -552,6 +552,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
@@ -574,13 +575,14 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,temp.exp \
 		$(TARGETNAME).o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) temp.exp
 
 $(TARGETNAME).dbg.o: $(TARGETNAME).o
 	$(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).o
 
-$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
+$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a
 	$(CC) \
 		-Wl,-T,$(TARGETNAME).dbg.lnk \
 		-nostartfiles \
@@ -594,6 +596,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).dbg.o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
@@ -616,6 +619,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
 		-Wl,--entry,_NtProcessStartup \
 		-Wl,temp.exp \
 		$(TARGETNAME).dbg.o -lgcc \
+		$(SDK_PATH_LIB)/string.a \
 		$(DDK_PATH_LIB)/hal.a
 	- $(RM) temp.exp
 
diff --git a/reactos/ntoskrnl/Makefile.i386 b/reactos/ntoskrnl/Makefile.i386
index 9a12a5c4c8d..4a84e5d972c 100644
--- a/reactos/ntoskrnl/Makefile.i386
+++ b/reactos/ntoskrnl/Makefile.i386
@@ -40,15 +40,11 @@ OBJECTS_MM_I386 := \
 	mm/i386/pfault.o
 
 OBJECTS_RTL_I386 := \
-	rtl/i386/memset.o \
-	rtl/i386/memcpy.o \
 	rtl/i386/except.o \
 	rtl/i386/exception.o \
 	rtl/i386/seh.o
 
-RTL_EXCLUDE_FILTER := \
-	rtl/memset.o \
-	rtl/memcpy.o
+RTL_EXCLUDE_FILTER := 
 
 OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) $(OBJECTS_RTL_I386)