Commit in reactos on MAIN
drivers/dd/null/makefile+2-21.19 -> 1.20
drivers/net/afd/makefile+3-31.14 -> 1.15
drivers/net/tcpip/makefile+13-131.32 -> 1.33
lib/cabinet/Makefile.ros-template+2-21.3 -> 1.4
lib/comctl32/Makefile.ros-template+2-21.3 -> 1.4
lib/comdlg32/Makefile.ros-template+1-11.3 -> 1.4
lib/dinput8/Makefile.ros+2-21.1 -> 1.2
           /Makefile.ros-template+2-21.1 -> 1.2
lib/dinput/Makefile.ros+2-21.1 -> 1.2
          /Makefile.ros-template+2-21.1 -> 1.2
lib/expat/Makefile+2-21.3 -> 1.4
lib/icmp/Makefile.ros-template+2-21.1 -> 1.2
lib/imagehlp/makefile+1-11.6 -> 1.7
lib/imm32/Makefile+1-11.5 -> 1.6
lib/iphlpapi/Makefile.ros-template+2-21.3 -> 1.4
lib/kernel32/makefile+2-21.90 -> 1.91
lib/kjs/makefile+2-21.1 -> 1.2
lib/libwine/makefile+2-21.3 -> 1.4
lib/midimap/Makefile.ros-template+2-21.1 -> 1.2
lib/mpr/Makefile.ros-template+2-21.3 -> 1.4
lib/msacm/Makefile.ros-template+2-21.3 -> 1.4
lib/msi/Makefile.ros-template+1-11.2 -> 1.3
lib/msvcrt20/Makefile+1-11.3 -> 1.4
lib/msvcrt/Makefile+2-21.48 -> 1.49
lib/msvideo/Makefile.ros-template+2-21.1 -> 1.2
lib/netapi32/Makefile.ros-template+2-21.3 -> 1.4
lib/odbc32/Makefile.ros-template+2-21.2 -> 1.3
lib/ole32/Makefile.ros-template+2-21.2 -> 1.3
lib/oleaut32/Makefile.ros-template+2-21.5 -> 1.6
lib/oledlg/Makefile.ros-template+2-21.3 -> 1.4
lib/olepro32/Makefile.ros-template+2-21.2 -> 1.3
lib/riched20/Makefile.ros-template+2-21.1 -> 1.2
lib/richedit/Makefile.ros-template+2-21.2 -> 1.3
lib/rpcrt4/Makefile.ros-template+2-21.3 -> 1.4
lib/setupapi/Makefile.ros-template+2-21.4 -> 1.5
lib/shell32/Makefile.ros-template+2-21.6 -> 1.7
lib/shlwapi/Makefile.ros-template+2-21.9 -> 1.10
lib/twain/Makefile+2-21.7 -> 1.8
lib/unicode/Makefile.ros-template+2-21.3 -> 1.4
lib/urlmon/Makefile.ros-template+2-21.2 -> 1.3
lib/user32/Makefile+2-21.40 -> 1.41
lib/version/makefile+2-21.15 -> 1.16
lib/winmm/Makefile.ros-template+2-21.3 -> 1.4
lib/winmm/midimap/Makefile.ros-template+2-21.3 -> 1.4
lib/winmm/wavemap/Makefile.ros-template+2-21.2 -> 1.3
lib/winspool/Makefile+1-11.5 -> 1.6
ntoskrnl/Makefile+7-71.156 -> 1.157
subsys/system/explorer/Makefile+1-11.43 -> 1.44
subsys/win32k/makefile+3-31.105 -> 1.106
tools/helper.mk+13-121.96 -> 1.97
+122-121
50 modified files
Prefix libs in dk/w32 and dk/nkm with "lib" to make use of GCC -l switch possible.
reactos/drivers/dd/null
makefile 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- makefile	1 Jul 2004 02:40:22 -0000	1.19
+++ makefile	3 Dec 2004 23:37:39 -0000	1.20
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.19 2004/07/01 02:40:22 hyperion Exp $

+# $Id: makefile,v 1.20 2004/12/03 23:37:39 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -12,6 +12,6 @@

 
 TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
 

-TARGET_LIBS = $(SDK_PATH_LIB)/pseh.a

+TARGET_LIBS = $(SDK_PATH_LIB)/libpseh.a

 
 include $(TOOLS_PATH)/helper.mk
reactos/drivers/net/afd
makefile 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- makefile	12 Nov 2004 07:34:55 -0000	1.14
+++ makefile	3 Dec 2004 23:37:39 -0000	1.15
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.14 2004/11/12 07:34:55 arty Exp $

+# $Id: makefile,v 1.15 2004/12/03 23:37:39 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -8,8 +8,8 @@

 
 TARGET_PCH = include/afd.h
 

-TARGET_DDKLIBS = \
-	$(PATH_TO_TOP)/dk/w32/lib/pseh.a

+TARGET_LIBS = \
+	$(PATH_TO_TOP)/dk/w32/lib/libpseh.a

 
 TARGET_CFLAGS = -I./include -I$(PATH_TO_TOP)/w32api/include/ddk -I$(PATH_TO_TOP)/include/afd -D__USE_W32API -Werror -Wall
reactos/drivers/net/tcpip
makefile 1.32 -> 1.33
diff -u -r1.32 -r1.33
--- makefile	25 Nov 2004 23:56:59 -0000	1.32
+++ makefile	3 Dec 2004 23:37:40 -0000	1.33
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.32 2004/11/25 23:56:59 arty Exp $

+# $Id: makefile,v 1.33 2004/12/03 23:37:40 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -22,16 +22,16 @@

 	-I$(PATH_TO_TOP)/w32api/include \
 	-I$(PATH_TO_TOP)/include
 

-TARGET_DDKLIBS = \
-	$(PATH_TO_TOP)/dk/w32/lib/ip.a \
-	$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a \
-	$(PATH_TO_TOP)/dk/w32/lib/rosrtl.a \
-	$(PATH_TO_TOP)/dk/w32/lib/pseh.a \
-	ndis.a

+TARGET_LIBS = \
+	$(PATH_TO_TOP)/dk/w32/lib/libip.a \
+	$(PATH_TO_TOP)/dk/w32/lib/liboskittcp.a \
+	$(PATH_TO_TOP)/dk/w32/lib/librosrtl.a \
+	$(PATH_TO_TOP)/dk/w32/lib/libpseh.a \
+	$(PATH_TO_TOP)/dk/nkm/lib/libndis.a

 
 TARGET_CLEAN = tcpip/*.o datalink/*.o \

-	$(PATH_TO_TOP)/dk/w32/lib/ip.a \
-	$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a 

+	$(PATH_TO_TOP)/dk/w32/lib/libip.a \
+	$(PATH_TO_TOP)/dk/w32/lib/liboskittcp.a

 
 TCPIP_OBJECTS    = tcpip/buffer.o \
 		   tcpip/dispatch.o \

@@ -63,13 +63,13 @@

 	$(MAKE) $(MOCKOBJS)
 
 preclean:

-	$(RM) 	$(PATH_TO_TOP)/dk/w32/lib/ip.a \
-		$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a

+	$(RM) 	$(PATH_TO_TOP)/dk/w32/lib/libip.a \
+		$(PATH_TO_TOP)/dk/w32/lib/liboskittcp.a

 

-$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a:

+$(PATH_TO_TOP)/dk/w32/lib/liboskittcp.a:

 	$(MAKE) -C $(PATH_TO_TOP)/drivers/lib/oskittcp
 

-$(PATH_TO_TOP)/dk/w32/lib/ip.a:

+$(PATH_TO_TOP)/dk/w32/lib/libip.a:

 	$(MAKE) -C $(PATH_TO_TOP)/drivers/lib/ip
 
 $(TARGET_OBJECTS):: makefile
reactos/lib/cabinet
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:42 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:42 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = cabinet
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_CABINET)
reactos/lib/comctl32
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:42 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:42 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = comctl32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32)
reactos/lib/comdlg32
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:42 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.4
@@ -5,7 +5,7 @@

 
 TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a libwine_unicode.a wine_uuid.a ntdll.a winspool.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_unicode.a wine_uuid.a ntdll.a winspool.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_COMDLG32)
reactos/lib/dinput8
Makefile.ros 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros	29 Nov 2004 00:14:14 -0000	1.1
+++ Makefile.ros	3 Dec 2004 23:37:40 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros,v 1.1 2004/11/29 00:14:14 greatlrd Exp $

+# $Id: Makefile.ros,v 1.2 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = dinput8
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS =  -D__REACTOS__
 

-TARGET_SDKLIBS = libwine.a dinput.a ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a

+TARGET_SDKLIBS = wine.a dinput.a ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a
reactos/lib/dinput8
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	29 Nov 2004 00:14:14 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/11/29 00:14:14 greatlrd Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = dinput8
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = libwine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a

+TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a
reactos/lib/dinput
Makefile.ros 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros	29 Nov 2004 00:13:49 -0000	1.1
+++ Makefile.ros	3 Dec 2004 23:37:40 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros,v 1.1 2004/11/29 00:13:49 greatlrd Exp $

+# $Id: Makefile.ros,v 1.2 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = dinput
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS =  -D__REACTOS__
 

-TARGET_SDKLIBS = libwine.a ole32.a user32.a advapi32.a kernel32.a ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a

+TARGET_SDKLIBS = wine.a ole32.a user32.a advapi32.a kernel32.a ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a
reactos/lib/dinput
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	29 Nov 2004 00:13:49 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/11/29 00:13:49 greatlrd Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = dinput
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = libwine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a

+TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a  winmm.a dxguid.a
reactos/lib/expat
Makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile	29 May 2004 21:24:43 -0000	1.3
+++ Makefile	3 Dec 2004 23:37:40 -0000	1.4
@@ -1,8 +1,8 @@

-# $Id: Makefile,v 1.3 2004/05/29 21:24:43 hbirr Exp $

+# $Id: Makefile,v 1.4 2004/12/03 23:37:40 blight Exp $

 
 PATH_TO_TOP = ../..
 

-TARGET_NAME = libexpat

+TARGET_NAME = expat

 
 TARGET_TYPE = dynlink
 TARGET_BASE = $(TARGET_BASE_LIB_EXPAT)
reactos/lib/icmp
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	28 Sep 2004 19:07:56 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/09/28 19:07:56 sedwards Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = icmp
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ ws2_32.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ ws2_32.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32)
reactos/lib/imagehlp
makefile 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- makefile	20 Jul 2004 16:48:18 -0000	1.6
+++ makefile	3 Dec 2004 23:37:40 -0000	1.7
@@ -35,7 +35,7 @@

 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 

-TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a

+TARGET_SDKLIBS = wine.a ntdll.a kernel32.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_IMAGEHLP)
reactos/lib/imm32
Makefile 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- Makefile	29 May 2004 21:24:44 -0000	1.5
+++ Makefile	3 Dec 2004 23:37:40 -0000	1.6
@@ -10,7 +10,7 @@

 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
 

-TARGET_SDKLIBS = libwine.a user32.a kernel32.a ntdll.a

+TARGET_SDKLIBS = wine.a user32.a kernel32.a ntdll.a

 
 TARGET_OBJECTS = imm.o
reactos/lib/iphlpapi
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	26 Nov 2004 00:32:59 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:40 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/11/26 00:32:59 arty Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:40 blight Exp $

 
 TARGET_NAME = iphlpapi
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a rtl.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a rtl.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_IPHLPAPI)
reactos/lib/kernel32
makefile 1.90 -> 1.91
diff -u -r1.90 -r1.91
--- makefile	29 Nov 2004 00:08:59 -0000	1.90
+++ makefile	3 Dec 2004 23:37:41 -0000	1.91
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.90 2004/11/29 00:08:59 gdalsnes Exp $

+# $Id: makefile,v 1.91 2004/12/03 23:37:41 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -17,7 +17,7 @@

 
 TARGET_RCFLAGS += -DWINVER=0x0500
 

-TARGET_SDKLIBS = pseh.a rosrtl.a ntdll.a kernel32.a libwine.a

+TARGET_SDKLIBS = pseh.a rosrtl.a ntdll.a kernel32.a wine.a

 
 TARGET_GCCLIBS = gcc
reactos/lib/kjs
makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- makefile	10 Jan 2004 20:38:17 -0000	1.1
+++ makefile	3 Dec 2004 23:37:41 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.1 2004/01/10 20:38:17 arty Exp $

+# $Id: makefile,v 1.2 2004/12/03 23:37:41 blight Exp $

 # Kernel JavaScript
 # 
 # You can use this for various things but the most obvious is as a powerful

@@ -71,7 +71,7 @@

 	       src/heap.o \
 	       src/utils.o
 TARGET_OBJECTS = $(ORIG_OBJECTS) $(MOD_OBJECTS) $(ARCH_OBJECTS) \

-		../../dk/w32/lib/ntdll.a

+		../../dk/w32/lib/libntdll.a

 DEP_OBJECTS = $(TARGET_OBJECTS)
 
 include $(PATH_TO_TOP)/rules.mak
reactos/lib/libwine
makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- makefile	16 Sep 2004 10:25:15 -0000	1.3
+++ makefile	3 Dec 2004 23:37:41 -0000	1.4
@@ -1,10 +1,10 @@

-# $Id: makefile,v 1.3 2004/09/16 10:25:15 gvg Exp $

+# $Id: makefile,v 1.4 2004/12/03 23:37:41 blight Exp $

 
 PATH_TO_TOP = ../..
 
 TARGET_TYPE = library
 

-TARGET_NAME = libwine

+TARGET_NAME = wine

 
 TARGET_CFLAGS = -D__REACTOS__
reactos/lib/midimap
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	9 Nov 2004 14:52:52 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/11/09 14:52:52 ion Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:41 blight Exp $

 
 TARGET_NAME = midimap
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_LIB_BASE_MIDIMAP)
reactos/lib/mpr
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	16 Oct 2004 20:27:35 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/10/16 20:27:35 gvg Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:41 blight Exp $

 
 TARGET_NAME = mpr
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ kernel32.a libwine.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ kernel32.a wine.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_MPR)
reactos/lib/msacm
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	14 Jul 2004 18:30:54 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/07/14 18:30:54 sedwards Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:41 blight Exp $

 
 TARGET_NAME = msacm32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ ntdll.a libwine.a

+TARGET_SDKLIBS = @IMPORTS@ ntdll.a wine.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_MSACM)
reactos/lib/msi
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	3 Dec 2004 06:21:44 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.3
@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a wine_unicode.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
reactos/lib/msvcrt20
Makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile	3 Oct 2004 14:24:43 -0000	1.3
+++ Makefile	3 Dec 2004 23:37:41 -0000	1.4
@@ -14,7 +14,7 @@

 
 TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
 

-TARGET_SDKLIBS = libwine.a string.a kernel32.a ntdll.a

+TARGET_SDKLIBS = wine.a string.a kernel32.a ntdll.a

 
 TARGET_GCCLIBS = gcc
reactos/lib/msvcrt
Makefile 1.48 -> 1.49
diff -u -r1.48 -r1.49
--- Makefile	3 Oct 2004 14:24:43 -0000	1.48
+++ Makefile	3 Dec 2004 23:37:41 -0000	1.49
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.48 2004/10/03 14:24:43 weiden Exp $

+# $Id: Makefile,v 1.49 2004/12/03 23:37:41 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -17,7 +17,7 @@

 
 TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
 

-TARGET_SDKLIBS = libwine.a string.a kernel32.a ntdll.a

+TARGET_SDKLIBS = wine.a string.a kernel32.a ntdll.a

 
 TARGET_GCCLIBS = gcc
reactos/lib/msvideo
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	10 Jul 2004 21:19:46 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/07/10 21:19:46 sedwards Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:41 blight Exp $

 
 TARGET_NAME = msvfw32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
reactos/lib/netapi32
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:44 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:41 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:44 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:41 blight Exp $

 
 TARGET_NAME = netapi32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_NETAPI32)
reactos/lib/odbc32
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	29 May 2004 21:24:45 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = odbc32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_ODBC32)
reactos/lib/ole32
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	29 May 2004 21:24:45 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = ole32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_OLE32)
reactos/lib/oleaut32
Makefile.ros-template 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- Makefile.ros-template	20 Oct 2004 20:31:36 -0000	1.5
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.6
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.5 2004/10/20 20:31:36 gvg Exp $

+# $Id: Makefile.ros-template,v 1.6 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = oleaut32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -DCOBJMACROS
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a wine_unicode.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_OLEAUT32)
reactos/lib/oledlg
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:45 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:45 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = oledlg
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_OLEDLG)
reactos/lib/olepro32
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	29 May 2004 21:24:45 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = olepro32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a oleaut32.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a oleaut32.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_OLEPRO32)
reactos/lib/riched20
Makefile.ros-template 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile.ros-template	20 Nov 2004 18:26:16 -0000	1.1
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.2
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.1 2004/11/20 18:26:16 sedwards Exp $

+# $Id: Makefile.ros-template,v 1.2 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = riched20
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a libwine_unicode.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a wine_unicode.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI)
reactos/lib/richedit
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	29 May 2004 21:24:46 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:46 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = riched32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_RICHEDIT)
reactos/lib/rpcrt4
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:46 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:46 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = rpcrt4
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -Wall
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_RPCRT4)
reactos/lib/setupapi
Makefile.ros-template 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- Makefile.ros-template	29 May 2004 21:24:46 -0000	1.4
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.5
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.4 2004/05/29 21:24:46 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.5 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = setupapi
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a libwine_unicode.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a wine_unicode.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI)
reactos/lib/shell32
Makefile.ros-template 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- Makefile.ros-template	30 Oct 2004 21:28:19 -0000	1.6
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.7
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.6 2004/10/30 21:28:19 mf Exp $

+# $Id: Makefile.ros-template,v 1.7 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = shell32
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = libwine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_SHELL32)
reactos/lib/shlwapi
Makefile.ros-template 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- Makefile.ros-template	21 Oct 2004 12:02:18 -0000	1.9
+++ Makefile.ros-template	3 Dec 2004 23:37:42 -0000	1.10
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.9 2004/10/21 12:02:18 gvg Exp $

+# $Id: Makefile.ros-template,v 1.10 2004/12/03 23:37:42 blight Exp $

 
 TARGET_NAME = shlwapi
 

@@ -9,7 +9,7 @@

 # FIXME: we don't do delayed imports yet so oleaut32.a is listed explicitly
 # NOTE: msvcrt.a must be listed before ntdll.a, because sprintf that is
 #       exported from ntdll doesn't support printing of float types (%f)

-TARGET_SDKLIBS = msvcrt.a @IMPORTS@ oleaut32.a libwine.a wine_uuid.a libwine_unicode.a msvcrt.a ntdll.a

+TARGET_SDKLIBS = msvcrt.a @IMPORTS@ oleaut32.a wine.a wine_uuid.a wine_unicode.a msvcrt.a ntdll.a

 
 TARGET_NORC = yes
reactos/lib/twain
Makefile 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- Makefile	29 May 2004 21:24:47 -0000	1.7
+++ Makefile	3 Dec 2004 23:37:42 -0000	1.8
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.7 2004/05/29 21:24:47 hbirr Exp $

+# $Id: Makefile,v 1.8 2004/12/03 23:37:42 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -11,7 +11,7 @@

 
 TARGET_BASE=$(TARGET_BASE_LIB_TWAIN_32)
 

-TARGET_SDKLIBS = ntdll.a libwine.a

+TARGET_SDKLIBS = ntdll.a wine.a

 
 TARGET_OBJECTS = \
 	capability.o \
reactos/lib/unicode
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	2 Nov 2004 19:47:18 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:43 -0000	1.4
@@ -1,6 +1,6 @@

-# $Id: Makefile.ros-template,v 1.3 2004/11/02 19:47:18 gvg Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:43 blight Exp $

 

-TARGET_NAME = libwine_unicode

+TARGET_NAME = wine_unicode

 
 CODEPAGES = @CODEPAGES@
reactos/lib/urlmon
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	14 Aug 2004 20:43:40 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:43 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/08/14 20:43:40 sedwards Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:43 blight Exp $

 
 TARGET_NAME = urlmon
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a wininet.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a wininet.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_RICHEDIT)
reactos/lib/user32
Makefile 1.40 -> 1.41
diff -u -r1.40 -r1.41
--- Makefile	17 Aug 2004 21:47:36 -0000	1.40
+++ Makefile	3 Dec 2004 23:37:43 -0000	1.41
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.40 2004/08/17 21:47:36 weiden Exp $

+# $Id: Makefile,v 1.41 2004/12/03 23:37:43 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -10,7 +10,7 @@

 
 TARGET_BASE = $(TARGET_BASE_LIB_USER32)
 

-TARGET_SDKLIBS = libwine.a ntdll.a gdi32.a rosrtl.a kernel32.a advapi32.a

+TARGET_SDKLIBS = wine.a ntdll.a gdi32.a rosrtl.a kernel32.a advapi32.a

 
 TARGET_CFLAGS = \
  -I./include \
reactos/lib/version
makefile 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- makefile	29 May 2004 21:24:47 -0000	1.15
+++ makefile	3 Dec 2004 23:37:43 -0000	1.16
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.15 2004/05/29 21:24:47 hbirr Exp $

+# $Id: makefile,v 1.16 2004/12/03 23:37:43 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -27,7 +27,7 @@

 
 TARGET_LFLAGS = -nostdlib -nostartfiles
 

-TARGET_SDKLIBS = libwine.a kernel32.a ntdll.a 

+TARGET_SDKLIBS = wine.a kernel32.a ntdll.a

 
 TARGET_OBJECTS = \
 	misc/libmain.o \
reactos/lib/winmm
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	29 May 2004 21:24:47 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:43 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:47 hbirr Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:43 blight Exp $

 
 TARGET_NAME = winmm
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
reactos/lib/winmm/midimap
Makefile.ros-template 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile.ros-template	9 Nov 2004 15:02:35 -0000	1.3
+++ Makefile.ros-template	3 Dec 2004 23:37:43 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.3 2004/11/09 15:02:35 ion Exp $

+# $Id: Makefile.ros-template,v 1.4 2004/12/03 23:37:43 blight Exp $

 
 TARGET_NAME = midimap
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = $(TARGET_LIB_BASE_MIDIMAP)
reactos/lib/winmm/wavemap
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	2 Aug 2004 14:58:59 -0000	1.2
+++ Makefile.ros-template	3 Dec 2004 23:37:43 -0000	1.3
@@ -1,4 +1,4 @@

-# $Id: Makefile.ros-template,v 1.2 2004/08/02 14:58:59 navaraf Exp $

+# $Id: Makefile.ros-template,v 1.3 2004/12/03 23:37:43 blight Exp $

 
 TARGET_NAME = msacm
 

@@ -6,7 +6,7 @@

 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 

-TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a

+TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a

 
 TARGET_BASE = 0x76160000
reactos/lib/winspool
Makefile 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- Makefile	29 May 2004 21:24:47 -0000	1.5
+++ Makefile	3 Dec 2004 23:37:43 -0000	1.6
@@ -27,7 +27,7 @@

 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 

-TARGET_SDKLIBS = libwine.a libwine_unicode.a ntdll.a kernel32.a

+TARGET_SDKLIBS = wine.a wine_unicode.a ntdll.a kernel32.a

 
 TARGET_OBJECTS = info.o stubs.o
reactos/ntoskrnl
Makefile 1.156 -> 1.157
diff -u -r1.156 -r1.157
--- Makefile	12 Nov 2004 12:05:27 -0000	1.156
+++ Makefile	3 Dec 2004 23:37:43 -0000	1.157
@@ -28,11 +28,11 @@

 ifeq ($(KDBG), 1)
 OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
                 dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o \

-		../dk/w32/lib/kjs.a dbg/i386/i386-dis.o

+		../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o

 CFLAGS_KDBG := -I../lib/kjs/include
 preall: all
 

-../dk/w32/lib/kjs.a:

+../dk/w32/lib/libkjs.a:

 	$(MAKE) -C ../lib/kjs
 else
 OBJECTS_KDBG :=

@@ -520,11 +520,11 @@

 TARGET_OBJECTS = $(EXTRA_OBJECTS) $(OBJECTS)
 
 TARGET_LIBS = \

-	$(DDK_PATH_LIB)/hal.a \
-	$(SDK_PATH_LIB)/rtl.a \
-	$(SDK_PATH_LIB)/string.a \
-	$(SDK_PATH_LIB)/rosrtl.a \
-	$(SDK_PATH_LIB)/pseh.a

+	$(DDK_PATH_LIB)/libhal.a \
+	$(SDK_PATH_LIB)/librtl.a \
+	$(SDK_PATH_LIB)/libstring.a \
+	$(SDK_PATH_LIB)/librosrtl.a \
+	$(SDK_PATH_LIB)/libpseh.a

 
 TARGET_LFLAGS = \
 	-Wl,-T,ntoskrnl.lnk \
reactos/subsys/system/explorer
Makefile 1.43 -> 1.44
diff -u -r1.43 -r1.44
--- Makefile	21 Nov 2004 10:53:55 -0000	1.43
+++ Makefile	3 Dec 2004 23:37:43 -0000	1.44
@@ -16,7 +16,7 @@

 TARGET_CPPFLAGS := $(TARGET_CFLAGS)
 TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__
 TARGET_SDKLIBS := \

-	gdi32.a comctl32.a ole32.a oleaut32.a shell32.a libexpat.a \

+	gdi32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \

 	notifyhook.a ws2_32.a msimg32.a
 TARGET_GCCLIBS := stdc++ uuid
 TARGET_OBJECTS := \
reactos/subsys/win32k
makefile 1.105 -> 1.106
diff -u -r1.105 -r1.106
--- makefile	16 Nov 2004 16:29:21 -0000	1.105
+++ makefile	3 Dec 2004 23:37:43 -0000	1.106
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.105 2004/11/16 16:29:21 blight Exp $

+# $Id: makefile,v 1.106 2004/12/03 23:37:43 blight Exp $

 
 PATH_TO_TOP = ../..
 

@@ -44,8 +44,8 @@

  $(CFLAGS_OPT)
 
 TARGET_LFLAGS =\

- $(PATH_TO_TOP)/dk/nkm/lib/freetype.a \
- $(PATH_TO_TOP)/dk/w32/lib/rosrtl.a \

+ $(PATH_TO_TOP)/dk/nkm/lib/libfreetype.a \
+ $(PATH_TO_TOP)/dk/w32/lib/librosrtl.a \

  --disable-stdcall-fixup
 
 ENG_OBJECTS= eng/debug.o eng/error.o eng/mem.o eng/brush.o eng/bitblt.o \
reactos/tools
helper.mk 1.96 -> 1.97
diff -u -r1.96 -r1.97
--- helper.mk	3 Dec 2004 20:10:45 -0000	1.96
+++ helper.mk	3 Dec 2004 23:37:44 -0000	1.97
@@ -1,4 +1,4 @@

-# $Id: helper.mk,v 1.96 2004/12/03 20:10:45 gvg Exp $

+# $Id: helper.mk,v 1.97 2004/12/03 23:37:44 blight Exp $

 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:

@@ -593,16 +593,16 @@

     MK_DEFBASE := 0x400000
   endif
   ifneq ($(TARGET_SDKLIBS),)

-    MK_LIBS := $(addprefix $(SDK_PATH_LIB)/, $(TARGET_SDKLIBS))

+    MK_LIBS := $(addprefix $(SDK_PATH_LIB)/lib, $(TARGET_SDKLIBS))

   else

-    MK_LIBS := $(addprefix $(SDK_PATH_LIB)/, $(MK_SDKLIBS))

+    MK_LIBS := $(addprefix $(SDK_PATH_LIB)/lib, $(MK_SDKLIBS))

   endif
 endif
 
 
 ifeq ($(MK_MODE),kernel)
   MK_DEFBASE := 0x10000

-  MK_LIBS := $(addprefix $(DDK_PATH_LIB)/, $(TARGET_DDKLIBS) $(MK_DDKLIBS))

+  MK_LIBS := $(addprefix $(DDK_PATH_LIB)/lib, $(TARGET_DDKLIBS) $(MK_DDKLIBS))

   MK_CFLAGS += -D_SEH_NO_NATIVE_NLG
   MK_CPPFLAGS += -D_SEH_NO_NATIVE_NLG
   MK_LFLAGS += -nostartfiles

@@ -653,18 +653,19 @@

 MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))
 
 ifeq ($(MK_MODE),static)

-  MK_FULLNAME := $(MK_LIBPATH)/$(MK_BASENAME)$(MK_EXT)

+  MK_FULLNAME := $(MK_LIBPATH)/lib$(MK_BASENAME)$(MK_EXT)

 else
   MK_FULLNAME := $(MK_BASENAME)$(MK_EXT)
 endif
 
 ifeq ($(TARGET_TYPE), kmlibrary)

-  MK_FULLNAME := $(DDK_PATH_LIB)/$(MK_BASENAME)$(MK_EXT)

+  MK_FULLNAME := $(DDK_PATH_LIB)/lib$(MK_BASENAME)$(MK_EXT)

 endif
 

-MK_IMPLIB_FULLNAME := $(MK_BASENAME)$(MK_IMPLIB_EXT)

+MK_IMPLIB_FULLNAME := lib$(MK_BASENAME)$(MK_IMPLIB_EXT)

 
 MK_NOSTRIPNAME := $(MK_BASENAME).nostrip$(MK_EXT)

+MK_DEBUGNAME := $(MK_BASENAME).dbg

 
 MK_EXTRADEP := $(filter %.h,$(TARGET_OBJECTS))
 

@@ -714,7 +715,7 @@

 	$(DLLTOOL) \
 		--dllname $(MK_FULLNAME) \
 		--def $(MK_DEFNAME) \

-		--output-lib $(MK_IMPLIBPATH)/$(MK_BASENAME).a \

+		--output-lib $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) \

 		$(MK_KILLAT)
 
 else # MK_IMPLIBONLY

@@ -926,13 +927,13 @@

 endif
 
 ifeq ($(MK_IMPLIB),yes)

-$(MK_IMPLIBPATH)/$(MK_BASENAME).a: $(MK_DEFNAME)

+$(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(MK_DEFNAME)

 	$(DLLTOOL) --dllname $(MK_FULLNAME) \
 		--def $(MK_DEFNAME) \

-		--output-lib $(MK_IMPLIBPATH)/$(MK_BASENAME).a \

+		--output-lib $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) \

 		$(MK_KILLAT)
 

-implib: $(MK_IMPLIBPATH)/$(MK_BASENAME).a

+implib: $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME)

 else
 implib: $(SUBDIRS:%=%_implib)
 endif

@@ -1105,7 +1106,7 @@

 ifeq ($(TARGET_TYPE),test)
 run: all
 	@$(CC) -nostdlib -o _runtest.exe regtests.a $(TARGET_LIBS) _stubs.o \

-	$(SDK_PATH_LIB)/rtshared.a $(SDK_PATH_LIB)/regtests.a $(SDK_PATH_LIB)/pseh.a \

+	$(SDK_PATH_LIB)/librtshared.a $(SDK_PATH_LIB)/libregtests.a $(SDK_PATH_LIB)/libpseh.a \

 	_hooks.o -lgcc -lmsvcrt -lntdll
 	@$(CP) $(REGTESTS_PATH)/regtests/regtests.dll regtests.dll
 	@_runtest.exe
CVSspam 0.2.8