Fixes to compile the whole set of ROS applications.

[reactos.git] / rosapps / sysutils / regexpl / Makefile

diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile
index 7f093f3..04c2c82 100644 (file)
--- a/rosapps/sysutils/regexpl/Makefile
+++ b/rosapps/sysutils/regexpl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2000/10/08 10:48:10 narnaoud Exp $
+# $Id: Makefile,v 1.6 2001/10/16 21:02:02 ea Exp $

 #
 #  ReactOS makefile for RegExpl
 #
 #
 #  ReactOS makefile for RegExpl
 #


@@ -7,17 +7,23 @@ include ../../rules.mak
 
 TARGET_NAME=regexpl
 
 
 TARGET_NAME=regexpl
 

+all: $(TARGET_NAME)$(EXE_POSTFIX)
+
+include depend.mak
+

 ROS_DIR=../../../reactos
 ROS_INC=$(ROS_DIR)/include
 ROS_DIR=../../../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
-
-all: $(TARGET_NAME)$(EXE_POSTFIX)
+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_CRTDLL=$(ROS_LIB)/crtdll.a
+
+depend.mak : *.h
+       $(CC) \
+               -MM *.cpp *.c > $@

 
 OBJECTS = \
        ArgumentParser.o                \
 
 OBJECTS = \
        ArgumentParser.o                \


@@ -30,7 +36,6 @@ OBJECTS = \
        ShellCommandChangeKey.o         \
        ShellCommandConnect.o           \
        ShellCommandDACL.o              \
        ShellCommandChangeKey.o         \
        ShellCommandConnect.o           \
        ShellCommandDACL.o              \

-       ShellCommandDOKA.o              \

        ShellCommandDeleteKey.o         \
        ShellCommandDeleteValue.o       \
        ShellCommandDir.o               \
        ShellCommandDeleteKey.o         \
        ShellCommandDeleteValue.o       \
        ShellCommandDir.o               \


@@ -45,26 +50,30 @@ OBJECTS = \
        ShellCommandsLinkedList.o       \
        CrtSupplement.c                 \
        TextHistory.o                   \
        ShellCommandsLinkedList.o       \
        CrtSupplement.c                 \
        TextHistory.o                   \

+       Completion.o                    \
+       Pattern.o                       \
+       Settings.o                      \
+       Prompt.o                        \

        $(TARGET_NAME).coff
 
 CLEAN_FILES = \
        *.o                             \
        $(TARGET_NAME)$(EXE_POSTFIX)    \
        $(TARGET_NAME).sym              \
        $(TARGET_NAME).coff
 
 CLEAN_FILES = \
        *.o                             \
        $(TARGET_NAME)$(EXE_POSTFIX)    \
        $(TARGET_NAME).sym              \

-       $(TARGET_NAME).coff
+       $(TARGET_NAME).coff\
+       depend.mak

 
 
 $(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)
        $(CC) \
                -Wl,--subsystem,console \
 
 
 $(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS)
        $(CC) \
                -Wl,--subsystem,console \

-               -o $(TARGET_NAME)       \
+               -o $@                           \

                $(IMPORT_KERNEL32)      \
                $(IMPORT_CRTDLL)        \
                $(IMPORT_USER32)        \
                $(OBJECTS)
        $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym
 
                $(IMPORT_KERNEL32)      \
                $(IMPORT_CRTDLL)        \
                $(IMPORT_USER32)        \
                $(OBJECTS)
        $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym
 

-

 clean: $(CLEAN_FILES:%=%_clean)
 
 $(CLEAN_FILES:%=%_clean): %_clean:
 clean: $(CLEAN_FILES:%=%_clean)
 
 $(CLEAN_FILES:%=%_clean): %_clean: