From e7a0c9b4eb2ba1e5e9f393296748d52599ae1ca9 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Sun, 10 Sep 2000 20:00:13 +0000 Subject: [PATCH] Little change to make version resource linked in ne2000.sys. svn path=/trunk/; revision=1349 --- reactos/drivers/net/dd/ne2000/Makefile | 6 +++--- reactos/drivers/net/ndis/Makefile | 3 ++- reactos/rules.mak | 6 +++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/net/dd/ne2000/Makefile b/reactos/drivers/net/dd/ne2000/Makefile index 3a2f68fc4df..f1840e48898 100644 --- a/reactos/drivers/net/dd/ne2000/Makefile +++ b/reactos/drivers/net/dd/ne2000/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2000/08/27 16:35:04 chorns Exp $ +# $Id: Makefile,v 1.2 2000/09/10 20:00:13 ea Exp $ # # NE2000.SYS build spec # @@ -8,7 +8,7 @@ TARGETNAME=ne2000 BASE_CFLAGS = -I./include -I../../../../include -DNDIS_MINIPORT_DRIVER RESOURCE_OBJECT = $(TARGETNAME).coff -NE2000_OBJECTS = ne2000/main.o ne2000/8390.o +NE2000_OBJECTS = ne2000/main.o ne2000/8390.o $(RESOURCE_OBJECT) IMPORT_LIBS = ../../ndis/ndis.a ../../../../ntoskrnl/ntoskrnl.a @@ -22,7 +22,7 @@ objects/ne2000.o: $(NE2000_OBJECTS) OBJECTS = objects/ne2000.o -$(TARGETNAME).coff: $(TARGETNAME).rc ../../../include/reactos/resource.h +$(TARGETNAME).coff: $(TARGETNAME).rc ../../../../include/reactos/resource.h ifeq ($(DOSCLI),yes) CLEAN_FILES = \ diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile index 7d02ac7aa21..b144a1211ed 100644 --- a/reactos/drivers/net/ndis/Makefile +++ b/reactos/drivers/net/ndis/Makefile @@ -8,7 +8,8 @@ RESOURCE_OBJECT = $(TARGETNAME).coff NDIS_OBJECTS = ndis/main.o ndis/40gone.o ndis/50gone.o ndis/buffer.o ndis/cl.o \ ndis/cm.o ndis/co.o ndis/control.o ndis/hardware.o \ ndis/io.o ndis/memory.o ndis/miniport.o \ - ndis/protocol.o ndis/string.o ndis/stubs.o ndis/time.o + ndis/protocol.o ndis/string.o ndis/stubs.o ndis/time.o \ + $(TARGETNAME).coff all: objects $(TARGETNAME).sys diff --git a/reactos/rules.mak b/reactos/rules.mak index f7dc8e03830..0684fcfbd97 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -86,7 +86,11 @@ AS = $(PREFIX)gcc -c -x assembler-with-cpp -D__ASM__ $(AS_BASEFLAGS) $(AS_INCLUD CPP = $(PREFIX)cpp AR = $(PREFIX)ar RC = $(PREFIX)windres -RCINC = --include-dir ../include --include-dir ../../include --include-dir ../../../include +RCINC = \ + --include-dir ../include \ + --include-dir ../../include \ + --include-dir ../../../include \ + --include-dir ../../../../include %.o: %.cc $(CC) $(CFLAGS) -c $< -o $@