From b9b94cdd0a05ff3cba661fda58279e4bdc74db5c Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 1 Dec 2004 18:56:39 +0000 Subject: merge from merge4 to merge5 --- kernel/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'kernel/Makefile.in') 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) -- cgit v1.2.3