Commit in rosapps on MAIN
sysutils/regexpl/Makefile+6-61.12 -> 1.13
tests/Makefile+4-21.2 -> 1.3
tests/lpc/makefile+2-21.1 -> 1.2
tests/mstest/Makefile+2-21.1 -> 1.2
tests/nptest/Makefile+1-11.1 -> 1.2
tests/shm/makefile+2-21.1 -> 1.2
+17-15
6 modified files
Fix rosapps build

rosapps/sysutils/regexpl
Makefile 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- Makefile	11 Oct 2004 01:20:13 -0000	1.12
+++ Makefile	29 Dec 2004 00:31:45 -0000	1.13
@@ -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 @@
 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		\

rosapps/tests
Makefile 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile	21 Oct 2004 05:20:21 -0000	1.2
+++ Makefile	29 Dec 2004 00:31:45 -0000	1.3
@@ -33,7 +33,6 @@
 dirdlg \
 diskspeed \
 dnsquery \
-dump_shared_data \
 edit \
 enhmetafile \
 enumfonts \
@@ -54,7 +53,6 @@
 lpc \
 map_dup_inherit \
 mdi \
-miditest \
 mktime \
 moztest \
 mstest \
@@ -95,6 +93,10 @@
 wm_paint \
 zwcontinue
 
+# Deactivated tests:
+# dump_shared_data
+# miditest
+
 all: $(TEST_APPS)
 
 depends: 

rosapps/tests/lpc
makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- makefile	21 Oct 2004 04:58:59 -0000	1.1
+++ makefile	29 Dec 2004 00:31:45 -0000	1.2
@@ -13,8 +13,8 @@
 
 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)
 

rosapps/tests/mstest
Makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile	21 Oct 2004 04:58:59 -0000	1.1
+++ Makefile	29 Dec 2004 00:31:45 -0000	1.2
@@ -13,8 +13,8 @@
 
 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)
 

rosapps/tests/nptest
Makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile	21 Oct 2004 04:59:00 -0000	1.1
+++ Makefile	29 Dec 2004 00:31:45 -0000	1.2
@@ -13,7 +13,7 @@
 
 CFLAGS = $(STD_CFLAGS)
 
-LIBS = $(SDK_PATH_LIB)/kernel32.a
+LIBS = $(SDK_PATH_LIB)/libkernel32.a
 
 all: $(PROGS)
 

rosapps/tests/shm
makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- makefile	21 Oct 2004 04:59:01 -0000	1.1
+++ makefile	29 Dec 2004 00:31:45 -0000	1.2
@@ -13,8 +13,8 @@
 
 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)
 
CVSspam 0.2.8