update for HEAD-2003050101

[reactos.git] / ntoskrnl / Makefile

diff --git a/ntoskrnl/Makefile b/ntoskrnl/Makefile
index e89e6b9..6e719f3 100644 (file)
--- a/ntoskrnl/Makefile
+++ b/ntoskrnl/Makefile
@@ -215,7 +215,8 @@ OBJECTS_OB = \
        ob/namespc.o \
        ob/ntobj.o \
        ob/object.o \
-       ob/security.o
+       ob/security.o \
+       ob/symlink.o
 
 # Process Manager (Ps)
 OBJECTS_PS = \
@@ -518,6 +519,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -539,6 +541,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -555,6 +558,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -576,6 +580,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,temp.exp \
                $(TARGETNAME).o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -595,6 +600,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,--base-file,base.tmp \
                $(TARGETNAME).dbg.o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -616,6 +622,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
                -Wl,--image-base,0xc0000000 \
                -Wl,--file-alignment,0x1000 \
                -Wl,--section-alignment,0x1000 \
+               -Wl,--entry,_NtProcessStartup \
                -Wl,temp.exp \
                $(TARGETNAME).dbg.o -lgcc \
                $(DDK_PATH_LIB)/hal.a
@@ -663,6 +670,15 @@ clean:
 
 .PHONY: clean
 
+ifneq ($(BOOTCD_INSTALL),)
+
+install: all $(INSTALL_DIR)/$(TARGETNAME).exe
+
+$(INSTALL_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(INSTALL_DIR)/$(TARGETNAME).exe
+
+else # BOOTCD_INSTALL
+
 install: all $(INSTALL_DIR)/system32/$(TARGETNAME).exe $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
 
 $(INSTALL_DIR)/system32/$(TARGETNAME).exe: $(TARGETNAME).exe
@@ -671,6 +687,9 @@ $(INSTALL_DIR)/system32/$(TARGETNAME).exe: $(TARGETNAME).exe
 $(INSTALL_DIR)/symbols/$(TARGETNAME).sym: $(TARGETNAME).sym
        $(CP) $(TARGETNAME).sym $(INSTALL_DIR)/symbols/$(TARGETNAME).sym
 
+endif # BOOTCD_INSTALL
+
+
 .PHONY: install
 
 dist: $(DIST_DIR)/$(TARGETNAME).exe
@@ -680,6 +699,14 @@ $(DIST_DIR)/$(TARGETNAME).exe: $(TARGETNAME).exe
 
 .PHONY: dist
 
+bootcd: all $(BOOTCD_DIR)/reactos/$(TARGETNAME).exe
+
+$(BOOTCD_DIR)/reactos/$(TARGETNAME).exe: $(TARGETNAME).exe
+       $(CP) $(TARGETNAME).exe $(BOOTCD_DIR)/reactos/$(TARGETNAME).exe
+
+.PHONY: bootcd
+
+
 ex/napi.o: ex/napi.c $(PATH_TO_TOP)/include/ntdll/napi.h
 
 ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h