diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:05:27 +0000 |
---|---|---|
committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:05:27 +0000 |
commit | ee14a5a87590c62784f8345096da3e619a6c7e04 (patch) | |
tree | 022ebaa1775e4b9ef3dfcd6fe09b609042e8ffd1 | |
parent | c68ca945dc13e36566be04d30b8c45129c925b9e (diff) | |
download | fuse-ee14a5a87590c62784f8345096da3e619a6c7e04.tar.gz |
move linux/fuse.h to fuse_kernel.hfuse_2_0_merge5
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | include/Makefile.am | 3 | ||||
-rw-r--r-- | include/linux/.cvsignore | 3 | ||||
-rw-r--r-- | include/linux/Makefile.am | 8 | ||||
-rw-r--r-- | kernel/Makefile.in | 9 | ||||
-rw-r--r-- | kernel/fuse_i.h | 2 | ||||
-rw-r--r-- | kernel/fuse_kernel.h (renamed from kernel/linux/fuse.h) | 0 | ||||
-rw-r--r-- | lib/fuse.c | 2 | ||||
-rwxr-xr-x | makeconf.sh | 2 | ||||
-rw-r--r-- | util/fusermount.c | 1 |
11 files changed, 13 insertions, 23 deletions
@@ -1,3 +1,7 @@ +2004-12-01 Miklos Szeredi <miklos@szeredi.hu> + + * move linux/fuse.h to fuse_kernel.h + 2004-11-29 Miklos Szeredi <miklos@szeredi.hu> * kernel: make readpage() uninterruptible diff --git a/configure.in b/configure.in index 94deca7..83946f6 100644 --- a/configure.in +++ b/configure.in @@ -51,5 +51,5 @@ AC_CHECK_MEMBERS([struct stat.st_atim]) AC_SUBST(subdirs2) -AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile]) +AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile]) AC_OUTPUT diff --git a/include/Makefile.am b/include/Makefile.am index 9e67b61..47cb099 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = linux - include_HEADERS = fuse.h +noinst_HEADERS = fuse_kernel.h diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore deleted file mode 100644 index 3e71cc3..0000000 --- a/include/linux/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.in -Makefile -fuse.h diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am deleted file mode 100644 index 486c3d4..0000000 --- a/include/linux/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in - -noinst_HEADERS = fuse.h - -all-local: fuse.h - -fuse.h: - ln -s ../../kernel/linux/fuse.h . diff --git a/kernel/Makefile.in b/kernel/Makefile.in index 42d1807..2cb000e 100644 --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -7,9 +7,8 @@ majver = @majver@ VERSION = @PACKAGE_VERSION@ DISTFILES = Makefile.in configure.ac configure config.h.in ../install-sh \ - dev.c dir.c file.c inode.c util.c fuse_i.h + dev.c dir.c file.c inode.c util.c fuse_i.h fuse_kernel.h COMPATDISTFILES = compat/parser.c compat/parser.h -LINUXDISTFILES = linux/fuse.h fusemoduledir = @kmoduledir@/kernel/fs/fuse @@ -40,12 +39,10 @@ distclean: clean maintainer-clean: distclean -distdir: $(DISTFILES) $(COMPATDISTFILES) $(LINUXDISTFILES) +distdir: $(DISTFILES) $(COMPATDISTFILES) cp -p $(DISTFILES) $(distdir) mkdir $(distdir)/compat cp -p $(COMPATDISTFILES) $(distdir)/compat - mkdir $(distdir)/linux - cp -p $(LINUXDISTFILES) $(distdir)/linux ifeq ($(majver), 2.4) @@ -66,7 +63,7 @@ all-spec: fuse.o fuse.o: $(fuse_objs) $(LD) -r -o fuse.o $(fuse_objs) -fuse_headers = fuse_i.h linux/fuse.h +fuse_headers = fuse_i.h fuse_kernel.h dev.o: $(fuse_headers) dir.o: $(fuse_headers) diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index d2eeece..52d8187 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -7,7 +7,7 @@ */ -#include <linux/fuse.h> +#include "fuse_kernel.h" #include <linux/version.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) diff --git a/kernel/linux/fuse.h b/kernel/fuse_kernel.h index 17d62f8..17d62f8 100644 --- a/kernel/linux/fuse.h +++ b/kernel/fuse_kernel.h @@ -8,7 +8,7 @@ #include <config.h> #include "fuse_i.h" -#include <linux/fuse.h> +#include "fuse_kernel.h" #include <string.h> #include <stdlib.h> diff --git a/makeconf.sh b/makeconf.sh index 34090e9..dc563d9 100755 --- a/makeconf.sh +++ b/makeconf.sh @@ -24,6 +24,8 @@ else autoconf ) fi +echo Linking kernel header file... +ln -sf ../kernel/fuse_kernel.h `dirname $0`/include rm -f config.cache config.status echo "To compile run './configure', and then 'make'." diff --git a/util/fusermount.c b/util/fusermount.c index c8c17b6..475e655 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -33,7 +33,6 @@ #include <sys/fsuid.h> #include <sys/socket.h> #include <sys/un.h> -#include <linux/fuse.h> #define FUSE_COMMFD_ENV "_FUSE_COMMFD" |