From 1f6906212fe1fb43f7df19fa6d2ab018acd89436 Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Wed, 1 Jun 2005 06:10:35 +0000
Subject: Simplify Makefiles.

---
 runtime/probes/tasklet/Makefile | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'runtime/probes/tasklet')

diff --git a/runtime/probes/tasklet/Makefile b/runtime/probes/tasklet/Makefile
index ceb8d4a9..a15e643f 100644
--- a/runtime/probes/tasklet/Makefile
+++ b/runtime/probes/tasklet/Makefile
@@ -1,23 +1,21 @@
 # Makefile
 
 PWD     := $(shell pwd)
+RT	:= $(PWD)/../..
 KVERSION	:= $(shell uname -r)
 KDIR	:= /lib/modules/$(KVERSION)/build include
 
-KALLSYMS_LOOKUP_NAME	:= $(firstword $(shell grep " kallsyms_lookup_name" /boot/System.map-$(KVERSION)))
-KALLSYMS_LOOKUP	:= $(firstword $(shell grep " kallsyms_lookup$$" /boot/System.map-$(KVERSION)))
-KTA	:= $(firstword $(shell grep "__kernel_text_address" /boot/System.map-$(KVERSION)))
+KALLSYMS_LOOKUP_NAME	:= 0x$(firstword $(shell grep " kallsyms_lookup_name" /boot/System.map-$(KVERSION)))
+KALLSYMS_LOOKUP	:= 0x$(firstword $(shell grep " kallsyms_lookup$$" /boot/System.map-$(KVERSION)))
+KTA	:= 0x$(firstword $(shell grep "__kernel_text_address" /boot/System.map-$(KVERSION)))
 
-CFLAGS += -I $(STP_RUNTIME) -I $(STP_RUNTIME)/relayfs -D KALLSYMS_LOOKUP_NAME=$(KALLSYMS_LOOKUP_NAME) \
-	-D KALLSYMS_LOOKUP=$(KALLSYMS_LOOKUP)
+EXTRA_CFLAGS := -I $(RT) -I $(RT)/relayfs -D KALLSYMS_LOOKUP_NAME=$(KALLSYMS_LOOKUP_NAME) -D KALLSYMS_LOOKUP=$(KALLSYMS_LOOKUP)
+
+obj-m := tasklet.o
 
-obj-m := stp_tasklet.o
 
 default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules \
-	KALLSYMS_LOOKUP_NAME=0x$(KALLSYMS_LOOKUP_NAME) \
-	KALLSYMS_LOOKUP=0x$(KALLSYMS_LOOKUP)  KTA=0x$(KTA)\
-	STP_RUNTIME=$(PWD)/../..
+	$(MAKE) V=1 -C $(KDIR) M=$(PWD) RT=$(RT) modules
 
 clean:
 	/bin/rm -rf *.o *.ko *~ *.mod.c .*.cmd .tmp_versions
-- 
cgit