From 181afb23d65f93a26943eba51e1c8002ed07d893 Mon Sep 17 00:00:00 2001 From: Gregor Anich Date: Fri, 3 Dec 2004 23:37:44 +0000 Subject: [PATCH] Prefix libs in dk/w32 and dk/nkm with "lib" to make use of GCC -l switch possible. svn path=/trunk/; revision=11910 --- reactos/drivers/dd/null/makefile | 4 +-- reactos/drivers/net/afd/makefile | 6 ++--- reactos/drivers/net/tcpip/makefile | 26 +++++++++---------- reactos/lib/cabinet/Makefile.ros-template | 4 +-- reactos/lib/comctl32/Makefile.ros-template | 4 +-- reactos/lib/comdlg32/Makefile.ros-template | 2 +- reactos/lib/dinput/Makefile.ros | 4 +-- reactos/lib/dinput/Makefile.ros-template | 4 +-- reactos/lib/dinput8/Makefile.ros | 4 +-- reactos/lib/dinput8/Makefile.ros-template | 4 +-- reactos/lib/expat/Makefile | 4 +-- reactos/lib/icmp/Makefile.ros-template | 4 +-- reactos/lib/imagehlp/makefile | 2 +- reactos/lib/imm32/Makefile | 2 +- reactos/lib/iphlpapi/Makefile.ros-template | 4 +-- reactos/lib/kernel32/makefile | 4 +-- reactos/lib/kjs/makefile | 4 +-- reactos/lib/libwine/makefile | 4 +-- reactos/lib/midimap/Makefile.ros-template | 4 +-- reactos/lib/mpr/Makefile.ros-template | 4 +-- reactos/lib/msacm/Makefile.ros-template | 4 +-- reactos/lib/msi/Makefile.ros-template | 2 +- reactos/lib/msvcrt/Makefile | 4 +-- reactos/lib/msvcrt20/Makefile | 2 +- reactos/lib/msvideo/Makefile.ros-template | 4 +-- reactos/lib/netapi32/Makefile.ros-template | 4 +-- reactos/lib/odbc32/Makefile.ros-template | 4 +-- reactos/lib/ole32/Makefile.ros-template | 4 +-- reactos/lib/oleaut32/Makefile.ros-template | 4 +-- reactos/lib/oledlg/Makefile.ros-template | 4 +-- reactos/lib/olepro32/Makefile.ros-template | 4 +-- reactos/lib/riched20/Makefile.ros-template | 4 +-- reactos/lib/richedit/Makefile.ros-template | 4 +-- reactos/lib/rpcrt4/Makefile.ros-template | 4 +-- reactos/lib/setupapi/Makefile.ros-template | 4 +-- reactos/lib/shell32/Makefile.ros-template | 4 +-- reactos/lib/shlwapi/Makefile.ros-template | 4 +-- reactos/lib/twain/Makefile | 4 +-- reactos/lib/unicode/Makefile.ros-template | 4 +-- reactos/lib/urlmon/Makefile.ros-template | 4 +-- reactos/lib/user32/Makefile | 4 +-- reactos/lib/version/makefile | 4 +-- reactos/lib/winmm/Makefile.ros-template | 4 +-- .../lib/winmm/midimap/Makefile.ros-template | 4 +-- .../lib/winmm/wavemap/Makefile.ros-template | 4 +-- reactos/lib/winspool/Makefile | 2 +- reactos/ntoskrnl/Makefile | 14 +++++----- reactos/subsys/system/explorer/Makefile | 2 +- reactos/subsys/win32k/makefile | 6 ++--- reactos/tools/helper.mk | 25 +++++++++--------- 50 files changed, 122 insertions(+), 121 deletions(-) diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile index ea0518641d8..692e2bde225 100644 --- a/reactos/drivers/dd/null/makefile +++ b/reactos/drivers/dd/null/makefile @@ -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_OBJECTS = null.o 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 diff --git a/reactos/drivers/net/afd/makefile b/reactos/drivers/net/afd/makefile index 409fcec3cdd..7378be4c1e6 100644 --- a/reactos/drivers/net/afd/makefile +++ b/reactos/drivers/net/afd/makefile @@ -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_NAME = afd 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 diff --git a/reactos/drivers/net/tcpip/makefile b/reactos/drivers/net/tcpip/makefile index 8a88e4a2b91..f341bbd4a79 100644 --- a/reactos/drivers/net/tcpip/makefile +++ b/reactos/drivers/net/tcpip/makefile @@ -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 @@ TARGET_CFLAGS = \ -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 @@ preall: preclean $(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 diff --git a/reactos/lib/cabinet/Makefile.ros-template b/reactos/lib/cabinet/Makefile.ros-template index fb90c0d5dd5..9b1e25adb57 100644 --- a/reactos/lib/cabinet/Makefile.ros-template +++ b/reactos/lib/cabinet/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/comctl32/Makefile.ros-template b/reactos/lib/comctl32/Makefile.ros-template index 37272100b65..ccdfac46e5b 100644 --- a/reactos/lib/comctl32/Makefile.ros-template +++ b/reactos/lib/comctl32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/comdlg32/Makefile.ros-template b/reactos/lib/comdlg32/Makefile.ros-template index 5fc6347b0f4..2a7a18c2d70 100644 --- a/reactos/lib/comdlg32/Makefile.ros-template +++ b/reactos/lib/comdlg32/Makefile.ros-template @@ -5,7 +5,7 @@ TARGET_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/dinput/Makefile.ros b/reactos/lib/dinput/Makefile.ros index c3d9ec9ec96..fa5ac8d31e5 100644 --- a/reactos/lib/dinput/Makefile.ros +++ b/reactos/lib/dinput/Makefile.ros @@ -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_OBJECTS = data_formats.o device.o dinput_main.o joystick_linux.o joystick 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 diff --git a/reactos/lib/dinput/Makefile.ros-template b/reactos/lib/dinput/Makefile.ros-template index d41e1e09c5f..197fe79f07b 100644 --- a/reactos/lib/dinput/Makefile.ros-template +++ b/reactos/lib/dinput/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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 diff --git a/reactos/lib/dinput8/Makefile.ros b/reactos/lib/dinput8/Makefile.ros index c1fa839a4db..2e71ff4a65f 100644 --- a/reactos/lib/dinput8/Makefile.ros +++ b/reactos/lib/dinput8/Makefile.ros @@ -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_OBJECTS = dinput8_main.o 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 diff --git a/reactos/lib/dinput8/Makefile.ros-template b/reactos/lib/dinput8/Makefile.ros-template index 2a764154a8b..c060b4c638b 100644 --- a/reactos/lib/dinput8/Makefile.ros-template +++ b/reactos/lib/dinput8/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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 diff --git a/reactos/lib/expat/Makefile b/reactos/lib/expat/Makefile index a1de9e0c7a0..850b758268a 100644 --- a/reactos/lib/expat/Makefile +++ b/reactos/lib/expat/Makefile @@ -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) diff --git a/reactos/lib/icmp/Makefile.ros-template b/reactos/lib/icmp/Makefile.ros-template index a075dd023f6..71e6152c07b 100644 --- a/reactos/lib/icmp/Makefile.ros-template +++ b/reactos/lib/icmp/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/imagehlp/makefile b/reactos/lib/imagehlp/makefile index 513a85b67cb..06022915d00 100644 --- a/reactos/lib/imagehlp/makefile +++ b/reactos/lib/imagehlp/makefile @@ -35,7 +35,7 @@ TARGET_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 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) diff --git a/reactos/lib/imm32/Makefile b/reactos/lib/imm32/Makefile index 8557e798a6c..a4292a7d15f 100644 --- a/reactos/lib/imm32/Makefile +++ b/reactos/lib/imm32/Makefile @@ -10,7 +10,7 @@ TARGET_BASE=$(TARGET_BASE_LIB_IMM32) # 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 diff --git a/reactos/lib/iphlpapi/Makefile.ros-template b/reactos/lib/iphlpapi/Makefile.ros-template index f784222639f..815c14a5d68 100644 --- a/reactos/lib/iphlpapi/Makefile.ros-template +++ b/reactos/lib/iphlpapi/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile index 1020dc4f133..8e4d65dc116 100644 --- a/reactos/lib/kernel32/makefile +++ b/reactos/lib/kernel32/makefile @@ -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_LFLAGS = -nostartfiles -nostdlib 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 diff --git a/reactos/lib/kjs/makefile b/reactos/lib/kjs/makefile index 9c2a229d210..22a7e9f445b 100644 --- a/reactos/lib/kjs/makefile +++ b/reactos/lib/kjs/makefile @@ -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 @@ ORIG_OBJECTS = src/b_array.o \ 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 diff --git a/reactos/lib/libwine/makefile b/reactos/lib/libwine/makefile index 7f84c185800..a4da00533d0 100644 --- a/reactos/lib/libwine/makefile +++ b/reactos/lib/libwine/makefile @@ -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__ diff --git a/reactos/lib/midimap/Makefile.ros-template b/reactos/lib/midimap/Makefile.ros-template index abeac05dba9..0f657d0e3a9 100644 --- a/reactos/lib/midimap/Makefile.ros-template +++ b/reactos/lib/midimap/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/mpr/Makefile.ros-template b/reactos/lib/mpr/Makefile.ros-template index 0400048058b..200aa6af32e 100644 --- a/reactos/lib/mpr/Makefile.ros-template +++ b/reactos/lib/mpr/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/msacm/Makefile.ros-template b/reactos/lib/msacm/Makefile.ros-template index b9a2fa1f289..72f6e63198c 100644 --- a/reactos/lib/msacm/Makefile.ros-template +++ b/reactos/lib/msacm/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/msi/Makefile.ros-template b/reactos/lib/msi/Makefile.ros-template index c3099046ac5..e4c59d27dab 100644 --- a/reactos/lib/msi/Makefile.ros-template +++ b/reactos/lib/msi/Makefile.ros-template @@ -6,7 +6,7 @@ TARGET_OBJECTS = @C_SRCS@ @EXTRA_OBJS@ 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) diff --git a/reactos/lib/msvcrt/Makefile b/reactos/lib/msvcrt/Makefile index 3442ca941be..1af9f4164ce 100644 --- a/reactos/lib/msvcrt/Makefile +++ b/reactos/lib/msvcrt/Makefile @@ -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 @@ RM_AT_FROM_SYMBOLS = no 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 diff --git a/reactos/lib/msvcrt20/Makefile b/reactos/lib/msvcrt20/Makefile index 0564e6122cf..74c67409044 100644 --- a/reactos/lib/msvcrt20/Makefile +++ b/reactos/lib/msvcrt20/Makefile @@ -14,7 +14,7 @@ RM_AT_FROM_SYMBOLS = no 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 diff --git a/reactos/lib/msvideo/Makefile.ros-template b/reactos/lib/msvideo/Makefile.ros-template index 6bca328078d..6780ae158f4 100644 --- a/reactos/lib/msvideo/Makefile.ros-template +++ b/reactos/lib/msvideo/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/netapi32/Makefile.ros-template b/reactos/lib/netapi32/Makefile.ros-template index 020cb509d69..b41ad550056 100644 --- a/reactos/lib/netapi32/Makefile.ros-template +++ b/reactos/lib/netapi32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/odbc32/Makefile.ros-template b/reactos/lib/odbc32/Makefile.ros-template index dd6b4e309ea..3d03fabfc09 100644 --- a/reactos/lib/odbc32/Makefile.ros-template +++ b/reactos/lib/odbc32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/ole32/Makefile.ros-template b/reactos/lib/ole32/Makefile.ros-template index 3badc40a700..4880f0f797e 100644 --- a/reactos/lib/ole32/Makefile.ros-template +++ b/reactos/lib/ole32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/oleaut32/Makefile.ros-template b/reactos/lib/oleaut32/Makefile.ros-template index 9d94e02fa9f..639529a3afe 100644 --- a/reactos/lib/oleaut32/Makefile.ros-template +++ b/reactos/lib/oleaut32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/oledlg/Makefile.ros-template b/reactos/lib/oledlg/Makefile.ros-template index 2e5401be943..0c63ec7c13d 100644 --- a/reactos/lib/oledlg/Makefile.ros-template +++ b/reactos/lib/oledlg/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/olepro32/Makefile.ros-template b/reactos/lib/olepro32/Makefile.ros-template index 8eb920c7d38..24bc9db2bc5 100644 --- a/reactos/lib/olepro32/Makefile.ros-template +++ b/reactos/lib/olepro32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/riched20/Makefile.ros-template b/reactos/lib/riched20/Makefile.ros-template index 0e3073760bf..1edbc7a3fb2 100644 --- a/reactos/lib/riched20/Makefile.ros-template +++ b/reactos/lib/riched20/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/richedit/Makefile.ros-template b/reactos/lib/richedit/Makefile.ros-template index c414a2ec84c..8e0f2c7d523 100644 --- a/reactos/lib/richedit/Makefile.ros-template +++ b/reactos/lib/richedit/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/rpcrt4/Makefile.ros-template b/reactos/lib/rpcrt4/Makefile.ros-template index eea98ecda7d..786cf763b3f 100644 --- a/reactos/lib/rpcrt4/Makefile.ros-template +++ b/reactos/lib/rpcrt4/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/setupapi/Makefile.ros-template b/reactos/lib/setupapi/Makefile.ros-template index c35c7be1a2c..8879eed4524 100644 --- a/reactos/lib/setupapi/Makefile.ros-template +++ b/reactos/lib/setupapi/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/shell32/Makefile.ros-template b/reactos/lib/shell32/Makefile.ros-template index 36632b92186..402ce7ca967 100644 --- a/reactos/lib/shell32/Makefile.ros-template +++ b/reactos/lib/shell32/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/shlwapi/Makefile.ros-template b/reactos/lib/shlwapi/Makefile.ros-template index e522128af9d..d28446b4ed0 100644 --- a/reactos/lib/shlwapi/Makefile.ros-template +++ b/reactos/lib/shlwapi/Makefile.ros-template @@ -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 @@ TARGET_CFLAGS = -DWINSHLWAPI= -D__REACTOS__ @EXTRADEFS@ # 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 diff --git a/reactos/lib/twain/Makefile b/reactos/lib/twain/Makefile index 568eed8310d..bd1ab7b190f 100644 --- a/reactos/lib/twain/Makefile +++ b/reactos/lib/twain/Makefile @@ -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_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror TARGET_BASE=$(TARGET_BASE_LIB_TWAIN_32) -TARGET_SDKLIBS = ntdll.a libwine.a +TARGET_SDKLIBS = ntdll.a wine.a TARGET_OBJECTS = \ capability.o \ diff --git a/reactos/lib/unicode/Makefile.ros-template b/reactos/lib/unicode/Makefile.ros-template index 69bead63216..39da2bfb7ea 100644 --- a/reactos/lib/unicode/Makefile.ros-template +++ b/reactos/lib/unicode/Makefile.ros-template @@ -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@ diff --git a/reactos/lib/urlmon/Makefile.ros-template b/reactos/lib/urlmon/Makefile.ros-template index 088baa231fd..7b4ac511aec 100644 --- a/reactos/lib/urlmon/Makefile.ros-template +++ b/reactos/lib/urlmon/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/user32/Makefile b/reactos/lib/user32/Makefile index 50bf6f25a87..1e1c9aa58a7 100644 --- a/reactos/lib/user32/Makefile +++ b/reactos/lib/user32/Makefile @@ -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_PCH = include/user32.h 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 \ diff --git a/reactos/lib/version/makefile b/reactos/lib/version/makefile index 241c563a66a..524c00d7956 100644 --- a/reactos/lib/version/makefile +++ b/reactos/lib/version/makefile @@ -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_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 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 \ diff --git a/reactos/lib/winmm/Makefile.ros-template b/reactos/lib/winmm/Makefile.ros-template index e3594700e15..44500c32066 100644 --- a/reactos/lib/winmm/Makefile.ros-template +++ b/reactos/lib/winmm/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/winmm/midimap/Makefile.ros-template b/reactos/lib/winmm/midimap/Makefile.ros-template index e20d10eb0bc..6f70f5ba33e 100644 --- a/reactos/lib/winmm/midimap/Makefile.ros-template +++ b/reactos/lib/winmm/midimap/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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) diff --git a/reactos/lib/winmm/wavemap/Makefile.ros-template b/reactos/lib/winmm/wavemap/Makefile.ros-template index 85e94303211..842756251c1 100644 --- a/reactos/lib/winmm/wavemap/Makefile.ros-template +++ b/reactos/lib/winmm/wavemap/Makefile.ros-template @@ -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_OBJECTS = @C_SRCS@ 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 diff --git a/reactos/lib/winspool/Makefile b/reactos/lib/winspool/Makefile index e23c80b1000..2b72c9d06cd 100644 --- a/reactos/lib/winspool/Makefile +++ b/reactos/lib/winspool/Makefile @@ -27,7 +27,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS 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 diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile index 5dce5cf309a..e65a8255177 100644 --- a/reactos/ntoskrnl/Makefile +++ b/reactos/ntoskrnl/Makefile @@ -28,11 +28,11 @@ endif 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 @@ EXTRA_OBJECTS = $(PATH_TO_TOP)/include/reactos/bugcodes.h 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 \ diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile index fe3dcde0c0b..fc6aa4ab0fa 100644 --- a/reactos/subsys/system/explorer/Makefile +++ b/reactos/subsys/system/explorer/Makefile @@ -16,7 +16,7 @@ TARGET_CFLAGS := \ 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 := \ diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile index c05581712d4..622dc572e8e 100644 --- a/reactos/subsys/win32k/makefile +++ b/reactos/subsys/win32k/makefile @@ -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 @@ TARGET_CFLAGS =\ $(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 \ diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk index 49b5293b632..fb3e7479ddf 100644 --- a/reactos/tools/helper.mk +++ b/reactos/tools/helper.mk @@ -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 @@ ifeq ($(MK_MODE),user) 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 @@ TARGET_LFLAGS += $(MK_LFLAGS) $(STD_LFLAGS) 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 @@ $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(MK_OBJECTS) $(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) else # MK_IMPLIBONLY @@ -926,13 +927,13 @@ depends: 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 @@ endif 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