[oprof-cvs] CVS: oprofile/module/x86 .cvsignore,1.1,1.2 Makefile.in,1.5,1.6 op_fixmap.c,1.2,1.3 op_syscalls.c,1.2,1.3 arch.mak,1.1,NONE

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/module/x86
In directory usw-pr-cvs1:/tmp/cvs-serv6471/module/x86

Modified Files:
	.cvsignore Makefile.in op_fixmap.c op_syscalls.c 
Removed Files:
	arch.mak 
Log Message:

Use Rules.make

May the breakage commence !



Index: .cvsignore
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	6 Jun 2002 04:17:01 -0000	1.1
+++ .cvsignore	10 Jun 2002 20:18:23 -0000	1.2
@@ -1,3 +1,4 @@
 .deps
+.*.flags
 Makefile
 oprofile.s

Index: Makefile.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	7 Jun 2002 03:38:33 -0000	1.5
+++ Makefile.in	10 Jun 2002 20:18:23 -0000	1.6
@@ -1,42 +1,37 @@
-LD=ld
-CC=@CC@
-
-INCLUDES = -I@KINC@/ -I@topdir@/ -I@topdir@/libutil/ -I@topdir@/libop/ -I..
-BASIC_KCFLAGS = -mcpu=i686 -pipe -O2 -fomit-frame-pointer -fno-strict-aliasing -Wall -Wstrict-prototypes -Wunused 
-KCFLAGS += $(INCLUDES) -D__KERNEL__ -DMODULE @BKCFLAGS@ @MODVERSIONS@ @NO_MODULE_VERSION@
-KCFLAGS += $(BASIC_KCFLAGS)
-ASMFLAGS = -D__ASSEMBLY__ -DMODULE -D__KERNEL__ -traditional -I@KINC@
+OPROFILE_DIR=@OPROFILE_DIR@
+VERSION=@VERSION@
+KVERS=@KVERS@
+KSRC=@KSRC@
 
+EXTRA_CFLAGS=@EXTRA_CFLAGS@ -D__NO_VERSION__ \
+	-I$(OPROFILE_DIR)/ -I$(OPROFILE_DIR)/libutil -I$(OPROFILE_DIR)/libop -I$(OPROFILE_DIR)/module
+ 
 # enable -Werror for non-release versions except for on 2.5 kernels
-ifneq (,$(findstring cvs,@VERSION@))
-ifeq (,$(findstring 2.5,@KVERS@))
-KCFLAGS += -Werror
+ifneq (,$(findstring cvs,$(VERSION)))
+ifeq (,$(findstring 2.5,$(KVERS)))
+EXTRA_CFLAGS += -Werror
 endif
 endif
+
+O_TARGET := arch.o
  
-HEADERS=op_apic.h arch_compat.h apic_compat.h
-SOURCES=cpu_type.c op_apic.c op_nmi.c op_fixmap.c op_syscalls.c
-ASMSOURCES=oprofile_nmi.S
-OBJECTS=cpu_type.o op_apic.o op_nmi.o op_fixmap.o op_syscalls.o oprofile_nmi.o
-TARGET=oprofile_arch.o
+obj-y := cpu_type.o op_apic.o op_fixmap.o op_nmi.o op_syscalls.o oprofile_nmi.o
+obj-m := $(O_TARGET)
+O_OBJS := $(obj-y)
+M_OBJS := $(O_TARGET)
 
-.PHONY: all install clean uninstall
+all:
+	(cd $(KSRC) && $(MAKE) SUBDIRS=$(OPROFILE_DIR)/module/x86 modules)
 
-all: $(TARGET)
-install:
-uninstall:
 clean:
-	rm -rf $(TARGET) $(OBJECTS) .deps
-
-$(TARGET): $(OBJECTS)
-	$(LD) -r -o $@ $(OBJECTS)
-
-%.o: %.c
-	$(CC) $(KCFLAGS) -c -o $@ $<
-
-%.o: %.S
-	$(CC) $(ASMFLAGS) -c -o $@ $<
+	rm -rf $(O_TARGET) $(obj-y) .deps .*.flags
+	 
+# FIXME: why do we need an explicit rule ??? 
+oprofile_nmi.o: oprofile_nmi.S
+	$(CC) -D__ASSEMBLY__ -D__KERNEL__ -traditional -c -o $@ $<
 
-MKDIR_P=mkdir -p
+TOPDIR := $(KSRC)
+CONFIG_SHELL := TOPDIR=$(KSRC) /bin/bash
+include $(KSRC)/Rules.make
 
-include ../../make.deps
+# FIXME: dependencies 

Index: op_fixmap.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/op_fixmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- op_fixmap.c	6 Jun 2002 16:18:24 -0000	1.2
+++ op_fixmap.c	10 Jun 2002 20:18:23 -0000	1.3
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 
 #include "oprofile.h"
+#include "apic_compat.h"
 
 unsigned long virt_apic_base;
 

Index: op_syscalls.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/op_syscalls.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- op_syscalls.c	6 Jun 2002 16:18:24 -0000	1.2
+++ op_syscalls.c	10 Jun 2002 20:18:23 -0000	1.3
@@ -263,7 +263,8 @@
 	return ret;
 }
 
-asmlinkage static long my_sys_exit(int error_code)
+/* used from do_nmi */
+asmlinkage long my_sys_exit(int error_code)
 {
 	struct op_note note;
 

--- arch.mak DELETED ---