diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2012-06-26 13:55:36 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@inai.de> | 2012-07-03 01:24:42 +0200 |
| commit | 673f8a422ccda9b87bbb7a930956e76afeef8948 (patch) | |
| tree | 9ffdc19cff328603e7340f8b113d6edca9f6231d | |
| parent | fbe46eac3e5638034f73bba5f55475170843b172 (diff) | |
| download | bindfs-673f8a422ccda9b87bbb7a930956e76afeef8948.tar.gz | |
build: better placement of variables
automake options are best set in configure.ac, so they apply
not just to the directory, but the whole project.
Also move fuse_CFLAGS into AM_CPPFLAGS, because it actually
consists of preprocessor directives. (pkgconfig misnamed CFLAGS.)
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 623153e..527ba9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,2 @@ -# not a GNU package. You can remove this line, if -# have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign - SUBDIRS = src tests diff --git a/configure.ac b/configure.ac index b618654..14c5236 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([bindfs],[1.10.4],[martin.partel@gmail.com]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER(config.h) AC_PROG_CC diff --git a/src/Makefile.am b/src/Makefile.am index 29661a7..412045c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ bin_PROGRAMS = bindfs noinst_HEADERS = debug.h permchain.h userinfo.h misc.h usermap.h bindfs_SOURCES = bindfs.c permchain.c userinfo.c misc.c usermap.c -AM_CPPFLAGS = ${my_CPPFLAGS} -AM_CFLAGS = ${my_CFLAGS} $(fuse_CFLAGS) +AM_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} +AM_CFLAGS = ${my_CFLAGS} bindfs_LDADD = $(fuse_LIBS) man_MANS = bindfs.1 |