Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [f85ab2] Maximize Restore History

integrated 2.6 kernel support

Miklos Szeredi Miklos Szeredi 2004-01-07

added README-2.4
added README-2.6
removed patch/fuse-2.6.patch
changed ChangeLog
changed configure.in
changed include
changed include/linux
changed include/linux/fuse.h
changed kernel
changed kernel/.cvsignore
changed kernel/dev.c
changed kernel/dir.c
changed kernel/file.c
changed kernel/fuse_i.h
changed kernel/inode.c
changed kernel/util.c
changed patch
copied kernel/Makefile.am -> kernel/Makefile.in
README-2.4 Diff Switch to side-by-side view
Loading...
README-2.6 Diff Switch to side-by-side view
Loading...
patch/fuse-2.6.patch
File was removed.
ChangeLog Diff Switch to side-by-side view
Loading...
configure.in Diff Switch to side-by-side view
Loading...
include
Directory.
include/linux
Directory.
include/linux/fuse.h Diff Switch to side-by-side view
Loading...
kernel
Directory.
kernel/.cvsignore Diff Switch to side-by-side view
Loading...
kernel/dev.c Diff Switch to side-by-side view
Loading...
kernel/dir.c Diff Switch to side-by-side view
Loading...
kernel/file.c Diff Switch to side-by-side view
Loading...
kernel/fuse_i.h Diff Switch to side-by-side view
Loading...
kernel/inode.c Diff Switch to side-by-side view
Loading...
kernel/util.c Diff Switch to side-by-side view
Loading...
patch
Directory.
kernel/Makefile.am to kernel/Makefile.in
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.in
@@ -1,35 +1,59 @@
-## Process this file with automake to produce Makefile.in
+# Makefile.in for kernel module
 
-EXTRA_DIST = dev.c dir.c file.c inode.c util.c fuse_i.h
+SHELL = /bin/sh
+INSTALL = @INSTALL@
+mkinstalldirs = $(SHELL) ../mkinstalldirs
+majver = @majver@
+
+EXTRA_CFLAGS := -I$(PWD)/../include
+DISTFILES = Makefile.in dev.c dir.c file.c inode.c util.c fuse_i.h
+
+fusemoduledir = @kmoduledir@/kernel/fs/fuse
+
+ifeq ($(majver), 2.4)
+fusemodule := fuse.o
+else
+fusemodule := fuse.ko
+endif
+
+all: all-spec
+
+install: all
+	@$(mkinstalldirs) $(DESTDIR)$(fusemoduledir)
+	$(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)
+	-/sbin/depmod -a
+
+uninstall:
+	rm -f $(DESTDIR)$(fusemoduledir)/$(fusemodule)
+	-/sbin/depmod -a
+
+clean:
+	-rm -f $(fusemodule) *.o .*.cmd *.mod.c *.ko *.s
+
+distclean: clean
+	rm -f Makefile
+
+maintainer-clean: distclean
+
+distdir: $(DISTFILES)
+	cp -p $(DISTFILES) $(distdir)
+
+
+ifeq ($(majver), 2.4)
 
 CC = @CC@
 LD = @LD@
 CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe
-CPPFLAGS = -I@KERNINCLUDE@ -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES
-INSTALL = @INSTALL@
-fusemoduledir = @kmoduledir@/kernel/fs/fuse
+CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES
+
+fuse_objs = dev.o dir.o file.o inode.o util.o
 
 SUFFIXES = .c .o .s
 
-
-all-local: fuse.o
-
-install-exec-local: fuse.o
-	$(mkinstalldirs) $(DESTDIR)$(fusemoduledir)
-	$(INSTALL) -m 644 fuse.o $(DESTDIR)$(fusemoduledir)/fuse.o
-	-/sbin/depmod -a
-
-uninstall-local:
-	rm -f $(DESTDIR)$(fusemoduledir)/fuse.o
-	-/sbin/depmod -a
-
-clean-local:
-	rm -f *.o *.s
+all-spec: fuse.o
 
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
-fuse_objs = dev.o dir.o file.o inode.o util.o
 
 fuse.o: $(fuse_objs)
 	$(LD) -r -o fuse.o $(fuse_objs)
@@ -41,3 +65,16 @@
 file.o: $(fuse_headers)
 inode.o: $(fuse_headers)
 util.o: $(fuse_headers)
+
+else
+
+obj-m := fuse.o
+fuse-objs := dev.o dir.o file.o inode.o util.o
+
+all-spec:
+	$(MAKE) -C @kernelsrc@ SUBDIRS=$(PWD) modules
+endif
+
+
+
+