From 3149ec5ad05bfcefdd239c61a7c7c4e613c98c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Wed, 29 Dec 2004 00:31:45 +0000 Subject: [PATCH] Fix rosapps build svn path=/trunk/; revision=12385 --- rosapps/sysutils/regexpl/Makefile | 12 ++++++------ rosapps/tests/Makefile | 6 ++++-- rosapps/tests/lpc/makefile | 4 ++-- rosapps/tests/mstest/Makefile | 4 ++-- rosapps/tests/nptest/Makefile | 2 +- rosapps/tests/shm/makefile | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile index ca8605b7233..947e74f97c3 100644 --- a/rosapps/sysutils/regexpl/Makefile +++ b/rosapps/sysutils/regexpl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.12 2004/10/11 01:20:13 sedwards Exp $ +# $Id: Makefile,v 1.13 2004/12/29 00:31:45 gvg Exp $ # # ReactOS makefile for RegExpl # @@ -14,11 +14,11 @@ all: $(TARGET_NAME)$(EXE_POSTFIX) ROS_DIR=../../../reactos ROS_INC=$(ROS_DIR)/include ROS_LIB=$(ROS_DIR)/dk/w32/lib -IMPORT_NTDLL=$(ROS_LIB)/ntdll.a -IMPORT_FMIFS=$(ROS_LIB)/fmifs.a -IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a -IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a -IMPORT_USER32=$(ROS_LIB)/user32.a +IMPORT_NTDLL=$(ROS_LIB)/libntdll.a +IMPORT_FMIFS=$(ROS_LIB)/libfmifs.a +IMPORT_KERNEL32=$(ROS_LIB)/libkernel32.a +IMPORT_ADVAPI32=$(ROS_LIB)/libadvapi32.a +IMPORT_USER32=$(ROS_LIB)/libuser32.a OBJECTS = \ ArgumentParser.o \ diff --git a/rosapps/tests/Makefile b/rosapps/tests/Makefile index d5b09f46da3..974e72eddfc 100644 --- a/rosapps/tests/Makefile +++ b/rosapps/tests/Makefile @@ -33,7 +33,6 @@ dibtest \ dirdlg \ diskspeed \ dnsquery \ -dump_shared_data \ edit \ enhmetafile \ enumfonts \ @@ -54,7 +53,6 @@ linetest \ lpc \ map_dup_inherit \ mdi \ -miditest \ mktime \ moztest \ mstest \ @@ -95,6 +93,10 @@ wm_erasebkgnd \ wm_paint \ zwcontinue +# Deactivated tests: +# dump_shared_data +# miditest + all: $(TEST_APPS) depends: diff --git a/rosapps/tests/lpc/makefile b/rosapps/tests/lpc/makefile index 90854643c1b..fee50de7cdd 100644 --- a/rosapps/tests/lpc/makefile +++ b/rosapps/tests/lpc/makefile @@ -13,8 +13,8 @@ PROGS= lpcsrv.exe lpcclt.exe CFLAGS = $(STD_CFLAGS) -LIBS = $(SDK_PATH_LIB)/kernel32.a \ - $(SDK_PATH_LIB)/ntdll.a +LIBS = $(SDK_PATH_LIB)/libkernel32.a \ + $(SDK_PATH_LIB)/libntdll.a all: $(PROGS) diff --git a/rosapps/tests/mstest/Makefile b/rosapps/tests/mstest/Makefile index e60f653d94d..b428d661dd9 100644 --- a/rosapps/tests/mstest/Makefile +++ b/rosapps/tests/mstest/Makefile @@ -13,8 +13,8 @@ PROGS = msserver.exe msclient.exe CFLAGS = $(STD_CFLAGS) -LIBS = $(SDK_PATH_LIB)/kernel32.a \ - $(SDK_PATH_LIB)/ntdll.a +LIBS = $(SDK_PATH_LIB)/libkernel32.a \ + $(SDK_PATH_LIB)/libntdll.a all: $(PROGS) diff --git a/rosapps/tests/nptest/Makefile b/rosapps/tests/nptest/Makefile index 783534c1244..09954c3832d 100644 --- a/rosapps/tests/nptest/Makefile +++ b/rosapps/tests/nptest/Makefile @@ -13,7 +13,7 @@ PROGS = npserver.exe npclient.exe CFLAGS = $(STD_CFLAGS) -LIBS = $(SDK_PATH_LIB)/kernel32.a +LIBS = $(SDK_PATH_LIB)/libkernel32.a all: $(PROGS) diff --git a/rosapps/tests/shm/makefile b/rosapps/tests/shm/makefile index a9e4d96951c..4cae009241c 100644 --- a/rosapps/tests/shm/makefile +++ b/rosapps/tests/shm/makefile @@ -13,8 +13,8 @@ PROGS= shmsrv.exe shmclt.exe CFLAGS = $(STD_CFLAGS) -LIBS = $(SDK_PATH_LIB)/kernel32.a \ - $(SDK_PATH_LIB)/ntdll.a +LIBS = $(SDK_PATH_LIB)/libkernel32.a \ + $(SDK_PATH_LIB)/libntdll.a all: $(PROGS)