Fixes to compile the whole set of ROS applications.

[reactos.git] / rosapps / sysutils / makefile

diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile
index df4e6c7..4d42779 100644 (file)
--- a/rosapps/sysutils/makefile
+++ b/rosapps/sysutils/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.6 2000/09/11 20:17:02 ea Exp $
+# $Id: makefile,v 1.10 2001/10/16 21:02:02 ea Exp $
 #
 # ReactOS System Utilities
 #
@@ -21,31 +21,35 @@
 # 2000-08-4 (ea)
 #      Added ldd.c; removed login.c
 #
-BASE_CFLAGS = -I../../reactos/include
+#
+PATH_TO_TOP=..
+PATH_TO_CVSROOT=../$(PATH_TO_TOP)
+
+BASE_CFLAGS = -I$(PATH_TO_CVSROOT)/reactos/include
 
 
-ROS_DIR=../../reactos
+ROS_DIR=$(PATH_TO_CVSROOT)/reactos
 ROS_INC=$(ROS_DIR)/include
-ROS_LIB=$(ROS_DIR)/lib
-IMPORT_NTDLL=$(ROS_LIB)/ntdll/ntdll.a
-IMPORT_FMIFS=$(ROS_LIB)/fmifs/fmifs.a
-IMPORT_KERNEL32=$(ROS_LIB)/kernel32/kernel32.a
-IMPORT_ADVAPI32=$(ROS_LIB)/advapi32/advapi32.a
-IMPORT_USER32=$(ROS_LIB)/user32/user32.a
-IMPORT_CRTDLL=$(ROS_LIB)/crtdll/crtdll.a
+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_MSVCRT=$(ROS_LIB)/msvcrt.a
 
 TARGET=\
-       regnav.exe      \
-       chklib.exe      \
-       qsi.exe         \
-       ldd.exe         \
-       pedump.exe      \
-       shutdown.exe    \
-       chkdsk.exe      \
-       format.exe
+       chklib$(EXE_POSTFIX)    \
+       ldd$(EXE_POSTFIX)       \
+       pedump$(EXE_POSTFIX)    \
+       shutdown$(EXE_POSTFIX)  \
+       chkdsk$(EXE_POSTFIX)    \
+       format$(EXE_POSTFIX)    \
+       regexpl/regexpl$(EXE_POSTFIX)
 
 all: $(TARGET)
 
+
 # By Mark Russinovich
 
 chkdsk.exe: chkdsk.o win32err.o wmain.o chkdsk.coff
@@ -56,7 +60,7 @@ chkdsk.exe: chkdsk.o win32err.o wmain.o chkdsk.coff
                chkdsk.coff             \
                $(IMPORT_FMIFS)         \
                $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o chkdsk.exe 
        $(NM) --numeric-sort chkdsk.exe > chkdsk.sym
 
@@ -68,7 +72,7 @@ format.exe: format.o win32err.o wmain.o format.coff
                format.coff             \
                $(IMPORT_FMIFS)         \
                $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o format.exe
        $(NM) --numeric-sort format.exe > format.sym
 
@@ -80,23 +84,11 @@ chklib.exe: chklib.o win32err.o chklib.coff
                win32err.o              \
                chklib.coff             \
                $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o chklib.exe
        $(NM) --numeric-sort chklib.exe > chklib.sym
 
 
-regnav.exe: regnav.o win32err.o regnav.coff
-       $(CC) \
-               regnav.o                \
-               win32err.o              \
-               regnav.coff             \
-               $(IMPORT_KERNEL32)      \
-               $(IMPORT_ADVAPI32)      \
-               $(IMPORT_CRTDLL)        \
-               -o regnav.exe
-       $(NM) --numeric-sort regnav.exe > regnav.sym
-       
-
 shutdown.exe: shutdown.o win32err.o shutdown.coff
        $(CC) \
                shutdown.o              \
@@ -104,29 +96,17 @@ shutdown.exe: shutdown.o win32err.o shutdown.coff
                shutdown.coff           \
                $(IMPORT_KERNEL32)      \
                $(IMPORT_USER32)        \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o shutdown.exe
        $(NM) --numeric-sort shutdown.exe > shutdown.sym
 
-qsi.exe: qsi.o qsi.coff
-       $(CC) \
-               qsi.o                   \
-               qsi.coff                \
-               $(IMPORT_NTDLL)         \
-               $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
-               -o qsi.exe
-       $(NM) --numeric-sort qsi.exe > qsi.sym
-
-qsi.o: qsi.c $(ROS_INC)/ddk/zwtypes.h
-
 pedump.exe: pedump.o pedump.coff
        $(CC) \
                pedump.o                \
                pedump.coff             \
                $(IMPORT_NTDLL)         \
                $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o pedump.exe
        $(NM) --numeric-sort pedump.exe > pedump.sym
 
@@ -138,12 +118,17 @@ ldd.exe: ldd.o win32err.o ldd.coff
                win32err.o              \
                ldd.coff                \
                $(IMPORT_KERNEL32)      \
-               $(IMPORT_CRTDLL)        \
+               $(IMPORT_MSVCRT)        \
                -o ldd.exe
        $(NM) --numeric-sort ldd.exe > ldd.sym
 
 ldd.o: ldd.c
 
+# By Nedko Arnaoudov
+
+regexpl/regexpl$(EXE_POSTFIX):
+       make -C regexpl
+
 #---
 
 CLEAN_FILES = *.o *.exe *.sym