diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-10 11:52:26 +0000 |
---|---|---|
committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-10 11:52:26 +0000 |
commit | 51ec103bec44fc172cb606e30fd681f378ed4809 (patch) | |
tree | a1f33cf34250c562cc41d2b58266cd0bb59c650c /kernel/Makefile.in | |
parent | 064efb0c65763655c3b7cc66b0dc0c553b60a2a5 (diff) | |
download | libfuse-51ec103bec44fc172cb606e30fd681f378ed4809.tar.gz |
merge up to fuse_2_0_merge1
Diffstat (limited to 'kernel/Makefile.in')
-rw-r--r-- | kernel/Makefile.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/kernel/Makefile.in b/kernel/Makefile.in index 7850b83..2f7b74b 100644 --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -2,11 +2,14 @@ SHELL = /bin/sh INSTALL = @INSTALL@ -mkdir_p = @mkdir_p@ +mkdir_p = mkdir -p majver = @majver@ +VERSION = @PACKAGE_VERSION@ -DISTFILES = Makefile.in dev.c dir.c file.c inode.c util.c fuse_i.h +DISTFILES = Makefile.in configure.ac configure config.h.in makeconf.sh \ + dev.c dir.c file.c inode.c util.c fuse_i.h COMPATDISTFILES = compat/parser.c compat/parser.h +LINUXDISTFILES = linux/fuse.h fusemoduledir = @kmoduledir@/kernel/fs/fuse @@ -32,20 +35,24 @@ clean: distclean: clean rm -f Makefile + rm -f config.h config.log config.status config.cache + rm -rf .tmp_versions maintainer-clean: distclean -distdir: $(DISTFILES) $(COMPATDISTFILES) +distdir: $(DISTFILES) $(COMPATDISTFILES) $(LINUXDISTFILES) cp -p $(DISTFILES) $(distdir) mkdir $(distdir)/compat cp -p $(COMPATDISTFILES) $(distdir)/compat + mkdir $(distdir)/linux + cp -p $(LINUXDISTFILES) $(distdir)/linux ifeq ($(majver), 2.4) -CC = @CC@ -LD = @LD@ +CC = gcc +LD = ld CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe -CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"@VERSION@\" @KERNELCPPFLAGS@ +CPPFLAGS = -I@kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@ fuse_objs = dev.o dir.o file.o inode.o util.o compat/parser.o @@ -59,7 +66,7 @@ all-spec: fuse.o fuse.o: $(fuse_objs) $(LD) -r -o fuse.o $(fuse_objs) -fuse_headers = fuse_i.h ../include/linux/fuse.h +fuse_headers = fuse_i.h linux/fuse.h dev.o: $(fuse_headers) dir.o: $(fuse_headers) @@ -69,8 +76,8 @@ util.o: $(fuse_headers) else -export FUSE_INCLUDE ?= $(shell pwd)/../include -EXTRA_CFLAGS += -I$(FUSE_INCLUDE) -DFUSE_VERSION=\"@VERSION@\" +export FUSE_INCLUDE ?= $(shell pwd) +EXTRA_CFLAGS += -I$(FUSE_INCLUDE) -DFUSE_VERSION=\"$(VERSION)\" obj-m := fuse.o fuse-objs := dev.o dir.o file.o inode.o util.o |