diff options
| author | Pino Toscano <toscano.pino@tiscali.it> | 2013-03-21 17:25:46 +0100 |
|---|---|---|
| committer | Pino Toscano <toscano.pino@tiscali.it> | 2013-03-21 17:25:46 +0100 |
| commit | defdeff585f61dbc7cff2ea6cfa5cfc66288b6a5 (patch) | |
| tree | d6117b5c2c54b264259aca71908ab8cbe9e24cf7 | |
| parent | 8bb3547d7c2e47a88006a2da9c82655efb5f950e (diff) | |
Simplify installation of the "old" fuse.h
Instead of using a single Makefile.am to just install the old fuse.h,
install it directly from include/Makefile.am.
* configure.ac (AC_CONFIG_FILES): Remove include/old/Makefile.
* include/Makefile.am (SUBDIRS): Remove variable.
(include_HEADERS): New variable.
* include/old/Makefile.am: Remove file.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 4 | ||||
| -rw-r--r-- | include/old/Makefile.am | 10 |
3 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index b1fa9afbd..86ddab6b5 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -ggdb" # Checks for library functions. AC_CONFIG_FILES([fuse.pc Makefile] - [include/Makefile include/old/Makefile src/Makefile] + [include/Makefile src/Makefile] [example/Makefile example-22/Makefile example-23/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 7df263119..56cc45ddf 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,11 +3,11 @@ # # Copyright (C) 2005,2006 Stefan Siegl <stesie@brokenpipe.de>, Germany -SUBDIRS = old - fuseincludedir=$(includedir)/fuse fuseinclude_HEADERS = \ fuse.h \ fuse_opt.h \ fuse_common.h \ fuse_compat.h + +include_HEADERS = old/fuse.h diff --git a/include/old/Makefile.am b/include/old/Makefile.am deleted file mode 100644 index f038a1cc1..000000000 --- a/include/old/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# Makefile.am -# Used by automake and configure to create Makefile. -# -# Copyright (C) 2005,2006 Stefan Siegl <stesie@brokenpipe.de>, Germany - -SUBDIRS = - -fuseincludedir=$(includedir) -fuseinclude_HEADERS = \ - fuse.h |