From e96dd1fa4e4ba81198e92f7abd340124ba126258 Mon Sep 17 00:00:00 2001 From: hunt Date: Tue, 17 May 2005 06:34:34 +0000 Subject: [PATCH] Use just "make" to build now. Changed some include paths. --- runtime/relayfs/Makefile | 9 +++++++-- runtime/relayfs/buffers.c | 2 +- runtime/relayfs/build | 4 ---- runtime/relayfs/inode.c | 2 +- runtime/relayfs/relay.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 100755 runtime/relayfs/build diff --git a/runtime/relayfs/Makefile b/runtime/relayfs/Makefile index 220a4e325..b9f2facf1 100644 --- a/runtime/relayfs/Makefile +++ b/runtime/relayfs/Makefile @@ -2,11 +2,16 @@ # relayfs Makefile # -CFLAGS += -I $(RELAYFS_INCLUDE) +PWD := $(shell pwd) +KDIR := /lib/modules/$(shell uname -r)/build + +relayfs-y := relay.o inode.o buffers.o obj-m += relayfs.o -relayfs-y := relay.o inode.o buffers.o +default: + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules clean: /bin/rm -rf *.o *.ko *~ *.mod.c .*.cmd .tmp_versions + diff --git a/runtime/relayfs/buffers.c b/runtime/relayfs/buffers.c index 476eafd8e..6ec9db9ec 100644 --- a/runtime/relayfs/buffers.c +++ b/runtime/relayfs/buffers.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "linux/relayfs_fs.h" #include "relay.h" #include "buffers.h" diff --git a/runtime/relayfs/build b/runtime/relayfs/build deleted file mode 100755 index a0eece3a1..000000000 --- a/runtime/relayfs/build +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -make V=1 -C /lib/modules/`uname -r`/build M=`pwd` modules \ - RELAYFS_INCLUDE=`pwd` diff --git a/runtime/relayfs/inode.c b/runtime/relayfs/inode.c index 2a52a65c5..3bff01e29 100644 --- a/runtime/relayfs/inode.c +++ b/runtime/relayfs/inode.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include "linux/relayfs_fs.h" #include "relay.h" #include "buffers.h" diff --git a/runtime/relayfs/relay.c b/runtime/relayfs/relay.c index 82ad71c7d..35a5f31dd 100644 --- a/runtime/relayfs/relay.c +++ b/runtime/relayfs/relay.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include "linux/relayfs_fs.h" #include "relay.h" #include "buffers.h" -- 2.43.5