Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Further dependency fixes

Browse source 
svn path=/trunk/; revision=1696
This commit is contained in:
David Welch 2001-03-15 23:41:31 +00:00
parent 7244e5bac9
commit 2eb05bdbc5
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/ntoskrnl/Makefile
View file

@ -1,9 +1,11 @@
# $Id: Makefile,v 1.22 2001/03/15 22:13:50 dwelch Exp $
# $Id: Makefile,v 1.23 2001/03/15 23:41:31 dwelch Exp $
#
# ReactOS Operating System
#
PATH_TO_TOP = ..
#
# Architecture to build for
#
@ -19,12 +21,14 @@ CFLAGS = -Iinclude -D__NTOSKRNL__ -DDBG -g -Wall -Werror
# -Wmissing-prototypes -Wshadow\
#CFLAGS += -DDBGPRINT_FILE_LOG
all: depends$(EXE_POSTFIX) \
include $(PATH_TO_TOP)/rules.mak
all: $(EXE_PREFIX)depends$(EXE_POSTFIX) \
$(OBJECTS_PATH) \
$(TARGETNAME).nostrip.exe \
$(TARGETNAME).exe
depends$(EXE_POSTFIX): depends.c
$(EXE_PREFIX)depends$(EXE_POSTFIX): depends.c
$(HOST_CC) -o depends$(EXE_POSTFIX) depends.c
#
@ -572,7 +576,7 @@ ke/main.o: ke/main.c ../include/reactos/buildno.h
include $(D1_FILES)
.%.d: %.c depends$(EXE_POSTFIX)
.%.d: %.c $(EXE_PREFIX)depends$(EXE_POSTFIX)
$(CC) $(CFLAGS) -M $< | $(EXE_PREFIX)depends$(EXE_POSTFIX) $(@D) $@
.%.d: %.s
@ -581,6 +585,6 @@ include $(D1_FILES)
.%.d: %.S
$(CC) $(CFLAGS) -M $< | $(EXE_PREFIX)depends$(EXE_POSTFIX) $(@D) $@
include $(PATH_TO_TOP)/rules.mak
# EOF

15
reactos/rules.mak
View file

@ -3,7 +3,7 @@
#
.EXPORT_ALL_VARIABLES:
#HOST = mingw32-windows
HOST = mingw32-windows
# uncomment if you use bochs and it displays only 30 rows
# BOCHS_30ROWS = yes
@ -12,8 +12,6 @@ ifeq ($(HOST),mingw32-linux)
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
endif
DOT := \.
#
# Choose various options
#
@ -22,8 +20,8 @@ NASM_FORMAT = win32
PREFIX = /usr/mingw32-cvs-000216/bin/mingw32-pc-
#PREFIX = i586-mingw32-
#PREFIX = /usr/mingw32-cvs-000207/bin/mingw32-cvs-000207-
EXE_POSTFIX =
EXE_PREFIX = ./
EXE_POSTFIX :=
EXE_PREFIX := ./
#CP = cp
CP = $(PATH_TO_TOP)/rcopy
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
@ -33,12 +31,15 @@ FLOPPY_DIR = /a
# DIST_DIR should be relative from the top of the tree
DIST_DIR = dist
DOT := \\.
DSEP := /
ENABLE_DEPENDENCY_TRACKING := 1
endif
ifeq ($(HOST),mingw32-windows)
NASM_FORMAT = win32
PREFIX =
EXE_POSTFIX = .exe
EXE_PREFIX :=
EXE_POSTFIX := .exe
#CP = copy /B
CP = $(PATH_TO_TOP)/rcopy
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
@ -51,6 +52,8 @@ FLOPPY_DIR = A:
# DIST_DIR should be relative from the top of the tree
DIST_DIR = dist
DOT := \.
DSEP := \\
ENABLE_DEPENDENCY_TRACKING := 1
endif
CC = $(PREFIX)gcc