Little change to make version resource linked in ne2000.sys.

svn path=/trunk/; revision=1349

diff --git a/reactos/drivers/net/dd/ne2000/Makefile b/reactos/drivers/net/dd/ne2000/Makefile
index 3a2f68f..f1840e4 100644 (file)
--- 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
 #
 #
 # NE2000.SYS build spec
 #


@@ -8,7 +8,7 @@ TARGETNAME=ne2000
 BASE_CFLAGS = -I./include -I../../../../include -DNDIS_MINIPORT_DRIVER
 
 RESOURCE_OBJECT  = $(TARGETNAME).coff
 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
 
 
 IMPORT_LIBS      = ../../ndis/ndis.a ../../../../ntoskrnl/ntoskrnl.a
 
 


@@ -22,7 +22,7 @@ objects/ne2000.o: $(NE2000_OBJECTS)
 
 OBJECTS = objects/ne2000.o
 
 
 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 = \
 
 ifeq ($(DOSCLI),yes)
 CLEAN_FILES = \

diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile
index 7d02ac7..b144a12 100644 (file)
--- 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_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
 
 
 all: objects $(TARGETNAME).sys
 

diff --git a/reactos/rules.mak b/reactos/rules.mak
index f7dc8e0..0684fcf 100644 (file)
--- 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
 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 $@
 
 %.o: %.cc
        $(CC) $(CFLAGS) -c $< -o $@