Fixed ne2000 driver so it will link correctly.

svn path=/trunk/; revision=2037

reactos/drivers/net/dd/ne2000/.cvsignore

@@ -1,2 +1,4 @@
+base.tmp
+junk.tmp
 ne2000.coff
-objects
+temp.exp

reactos/drivers/net/dd/ne2000/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2001/06/22 12:28:52 ekohl Exp $
+# $Id: Makefile,v 1.9 2001/07/04 21:24:02 chorns Exp $
 #
 #
 PATH_TO_TOP = ../../../..
@@ -7,75 +7,70 @@ CFLAGS = -D__NTDRIVER__ -Iinclude
 
 TARGETNAME = ne2000
 
-OBJECTS = ne2000/main.o ne2000/8390.o $(TARGET).coff $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
-
 RESOURCE_OBJECT  = $(TARGETNAME).coff
 NE2000_OBJECTS   = ne2000/main.o ne2000/8390.o $(RESOURCE_OBJECT)
-IMPORT_LIBS      = ../../ndis/ndis.a ../../../../ntoskrnl/ntoskrnl.a
+IMPORT_LIBS      = $(PATH_TO_TOP)/services/net/ndis/ndis.a \
+                   $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
+OBJECTS = $(NE2000_OBJECTS) $(IMPORT_LIBS)
 
-all: objects $(TARGETNAME).sys
+all: $(TARGETNAME).sys
 
-objects:
-	mkdir objects
-
-objects/ne2000.o: $(NE2000_OBJECTS)
-	$(LD) -r $(NE2000_OBJECTS) -o objects/ne2000.o
-
-OBJECTS = objects/ne2000.o
-
-$(TARGETNAME).coff: $(TARGETNAME).rc ../../../../include/reactos/resource.h
+$(TARGETNAME).coff: $(TARGETNAME).rc $(PATH_TO_TOP)/include/reactos/resource.h
 
 ifeq ($(DOSCLI),yes)
 CLEAN_FILES = \
-		*.o ne2000\*.o objects\*.o $(TARGETNAME).coff \
+	    ne2000\*.o $(TARGETNAME).coff \
         $(TARGETNAME).a junk.tmp base.tmp temp.exp \
 		$(TARGETNAME).sys $(TARGETNAME).sym
 else
 CLEAN_FILES = \
-		*.o ne2000\*.o objects/*.o $(TARGETNAME).coff \
+		ne2000/*.o $(TARGETNAME).coff \
         $(TARGETNAME).a junk.tmp base.tmp temp.exp \
 		$(TARGETNAME).sys $(TARGETNAME).sym
 endif
 
-$(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def
-	$(LD) -r $(OBJECTS) -o $(TARGETNAME).o
+$(TARGETNAME).sys: $(OBJECTS)
 	$(DLLTOOL) \
 		--dllname $(TARGETNAME).sys \
 		--def $(TARGETNAME).def \
-		--output-lib $(TARGETNAME).a \
-		--kill-at
+		--kill-at \
+		--output-lib $(TARGETNAME).a
 	$(CC) \
-		-nostdlib -nostdinc \
-		--subsystem=native \
-		-mdll \
-		--dll \
-		-e _DriverEntry@8 \
-		-o $(TARGETNAME).sys \
-		-Wl,--image-base,0x10000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--defsym,_end=end \
-		-Wl,--defsym,_edata=__data_end__ \
-		-Wl,--defsym,_etext=etext \
-		-Wl,--base-file,base.tmp \
-		$(TARGETNAME).o \
-		$(IMPORT_LIBS)
+        $(OBJECTS) \
+        -mdll \
+        -o junk.tmp \
+        -Wl,--image-base,0x10000 \
+        -Wl,--defsym,_end=end \
+	    -Wl,--defsym,_edata=__data_end__ \
+        -Wl,--defsym,_etext=etext \
+	    -Wl,--base-file,base.tmp
+	- $(RM) junk.tmp
+	$(DLLTOOL) \
+        --dllname $(TARGETNAME).sys \
+        --base-file base.tmp \
+		--output-exp temp.exp \
+        --def $(TARGETNAME).edf
 	- $(RM) base.tmp
+	$(CC) \
+        $(OBJECTS) \
+        -mdll \
+        -o $(TARGETNAME).sys \
+        -Wl,--image-base,0x10000 \
+        -Wl,-e,_DriverEntry@8 \
+        -Wl,--defsym,_end=end \
+	    -Wl,--defsym,_edata=__data_end__ \
+        -Wl,--defsym,_etext=etext \
+        -Wl,temp.exp 
+	- $(RM) temp.exp
 	$(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym
 
-clean:
-	- $(RM) *.o
-	- $(RM) *.a
-	- $(RM) ne2000\*.o
-	- $(RM) objects\*.o
-	- $(RM) junk.tmp
-	- $(RM) base.tmp
-	- $(RM) temp.exp
-	- $(RM) $(TARGETNAME).coff
-	- $(RM) $(TARGETNAME).sym
-	- $(RM) $(TARGETNAME).sys
+clean: $(CLEAN_FILES:%=%_clean)
 
+$(CLEAN_FILES:%=%_clean): %_clean:
+	- $(RM) $*
+
+.PHONY: clean $(CLEAN_FILES:%=%_clean)
 .phony: clean
 
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
@@ -83,13 +78,12 @@ install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-	$(CP) $(TARGETNAME).sys ../../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
+	$(CP) $(TARGETNAME).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys
 
 $(TARGETNAME).sys: $(OBJECTS)
 
 WITH_DEBUGGING=yes
-include ../../../../rules.mak
-
+include $(PATH_TO_TOP)/rules.mak

reactos/drivers/net/dd/ne2000/ne2000.edf

@@ -0,0 +1,7 @@
+; Novell Eagle 2000 driver - ReactOS Operating System
+
+LIBRARY NE2000.SYS
+
+EXPORTS
+
+; EOF