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 --- include/Makefile.am | 3 +-- include/linux/.cvsignore | 3 --- include/linux/Makefile.am | 8 -------- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 include/linux/.cvsignore delete mode 100644 include/linux/Makefile.am (limited to 'include') diff --git a/include/Makefile.am b/include/Makefile.am index feb8cbd..f6f1600 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = linux - fuseincludedir=$(includedir)/fuse fuseinclude_HEADERS = fuse.h +noinst_HEADERS = fuse_kernel.h # remove fuse.h from old place to avoid collision with new one install-data-local: 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 . -- cgit v1.2.3