diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:56:39 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:56:39 +0000 |
| commit | b9b94cdd0a05ff3cba661fda58279e4bdc74db5c (patch) | |
| tree | 79461f2a8fe5ea8aeb83cf312b542919d69e67e1 /include | |
| parent | 039322d8f1295bf20057303882bf1202a03d125e (diff) | |
| download | android_external_fuse-b9b94cdd0a05ff3cba661fda58279e4bdc74db5c.tar.gz android_external_fuse-b9b94cdd0a05ff3cba661fda58279e4bdc74db5c.tar.bz2 android_external_fuse-b9b94cdd0a05ff3cba661fda58279e4bdc74db5c.zip | |
merge from merge4 to merge5
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 3 | ||||
| -rw-r--r-- | include/linux/.cvsignore | 3 | ||||
| -rw-r--r-- | include/linux/Makefile.am | 8 |
3 files changed, 1 insertions, 13 deletions
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 . |