- Move NCI generated files to arch-specific directories

[reactos.git] / reactos / tools / nci / nci.mak

diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index c3e6c76..fdf14bc 100644 (file)
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -30,11 +30,11 @@ NCI_HOST_LFLAGS = $(TOOLS_LFLAGS)
 
 $(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT)
        $(ECHO_LD)
-       ${host_gcc} -g $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@
+       ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@
 
 $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT)
        $(ECHO_CC)
-       ${host_gcc} -g $(NCI_HOST_CFLAGS) -c $< -o $@
+       ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@
 
 .PHONY: nci_clean
 nci_clean:
@@ -44,14 +44,14 @@ clean: nci_clean
 # WIN32K.SYS
 WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db
 WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
-WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)win32k.S
-WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)win32k.S
+WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
+WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
 
 # NTOSKRNL.EXE
 KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst
 KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h
-NTDLL_STUBS = dll$(SEP)ntdll$(SEP)napi.S
-KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S
+NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S
+KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S
 
 NCI_SERVICE_FILES = \
        $(KERNEL_SERVICE_TABLE) \
@@ -63,6 +63,10 @@ NCI_SERVICE_FILES = \
 
 $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB)
        $(ECHO_NCI)
+       ${mkdir} dll$(SEP)ntdll$(SEP)$(ARCH) 2>$(NUL)
+       ${mkdir} ntoskrnl$(SEP)ex$(SEP)$(ARCH) 2>$(NUL)
+       ${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
+       ${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
        $(Q)$(NCI_TARGET) -arch $(ARCH) \
                $(KERNEL_SVC_DB) \
                $(WIN32K_SVC_DB) \