minor fixes

svn path=/trunk/; revision=1420

diff --git a/reactos/drivers/input/mouclass/makefile b/reactos/drivers/input/mouclass/makefile
index e49d5e3..40269cc 100644 (file)
--- a/reactos/drivers/input/mouclass/makefile
+++ b/reactos/drivers/input/mouclass/makefile
@@ -1,12 +1,14 @@
-# $Id: makefile,v 1.1 2000/10/18 09:09:14 jfilby Exp $
+# $Id: makefile,v 1.2 2000/10/25 13:09:05 jfilby Exp $
 #
 #
 TARGET = mouclass
 
-BASE_CFLAGS = -I../../../include
+PATH_TO_TOP = ../../..
 
 OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 
+CFLAGS = -O2 -I.
+
 all: $(TARGET).sys
 
 .phony: all

diff --git a/reactos/drivers/input/psaux/makefile b/reactos/drivers/input/psaux/makefile
new file mode 100644 (file)
index 0000000..7e5648e
--- /dev/null
+++ b/reactos/drivers/input/psaux/makefile
@@ -0,0 +1,73 @@
+# $Id: makefile,v 1.1 2000/10/25 13:09:05 jfilby Exp $
+#
+#
+TARGET = psaux
+
+PATH_TO_TOP = ../../..
+
+OBJECTS = $(TARGET).o  controller.o mouse.o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+
+CFLAGS = -O2 -I.
+
+all: $(TARGET).sys
+
+.phony: all
+
+clean:
+       - $(RM) $(TARGET).o
+       - $(RM) $(TARGET).coff
+       - $(RM) junk.tmp
+       - $(RM) base.tmp
+       - $(RM) temp.exp
+       - $(RM) psaux.sys
+
+.phony: clean
+
+install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
+
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+ifeq ($(DOSCLI),yes)
+       $(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
+else
+       $(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
+endif
+
+dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+
+../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+ifeq ($(DOSCLI),yes)
+       $(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
+else
+       $(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+endif
+
+$(TARGET).sys: $(OBJECTS)
+       $(CC) \
+               -specs=../../svc_specs \
+               -mdll \
+               -o junk.tmp \
+               -Wl,--defsym,_end=end \
+               -Wl,--defsym,_edata=__data_end__ \
+               -Wl,--defsym,_etext=etext \
+               -Wl,--base-file,base.tmp \
+               $(OBJECTS)
+       - $(RM) junk.tmp
+       $(DLLTOOL) \
+               --dllname $(TARGET).sys \
+               --base-file base.tmp \
+               --output-exp temp.exp \
+               --kill-at
+       - $(RM) base.tmp
+       $(CC) \
+               --verbose \
+               -Wl,--image-base,0x10000 \
+               -Wl,-e,_DriverEntry@8 \
+               -Wl,temp.exp \
+               -specs=../../svc_specs \
+               -mdll \
+               -o $(TARGET).sys \
+               $(OBJECTS)
+       - $(RM) temp.exp
+
+
+include ../../../rules.mak

diff --git a/reactos/drivers/input/psaux/mouse.c b/reactos/drivers/input/psaux/mouse.c
index fc978ed..7794a9c 100644 (file)
--- a/reactos/drivers/input/psaux/mouse.c
+++ b/reactos/drivers/input/psaux/mouse.c
@@ -1,8 +1,5 @@
-// All or parts of this file are from CHAOS (http://www.se.chaosdev.org/).
-// CHAOS is also under the GNU General Public License.
-
 #include <ddk/ntddk.h>
-
+#include "../include/mouse.h"
 #include "controller.h"
 #include "mouse.h"
 #include "psaux.h"