Changed autotools to use libtool because it doesn't support files in subdirectories.
This commit is contained in:
11
Makefile.am
11
Makefile.am
@@ -1,10 +1,11 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
SUBDIRS = compat
|
||||||
|
|
||||||
bin_PROGRAMS = curlftpfs
|
bin_PROGRAMS = curlftpfs
|
||||||
|
|
||||||
if FUSE_OPT_COMPAT
|
curlftpfs_SOURCES = ftpfs.c cache.c cache.h
|
||||||
compat_sources = compat/fuse_opt.c compat/fuse_opt.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
curlftpfs_SOURCES = ftpfs.c cache.c cache.h $(compat_sources)
|
|
||||||
curlftpfs_CPPFLAGS = -DFUSE_USE_VERSION=25
|
curlftpfs_CPPFLAGS = -DFUSE_USE_VERSION=25
|
||||||
|
|
||||||
|
if FUSE_OPT_COMPAT
|
||||||
|
curlftpfs_LDADD = compat/libcompat.la
|
||||||
|
endif
|
||||||
|
@@ -3,6 +3,7 @@ AM_INIT_AUTOMAKE
|
|||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
AC_PROG_LIBTOOL
|
||||||
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
|
||||||
PKG_CHECK_MODULES(FTPFS, [fuse >= 2.2 glib-2.0 libcurl >= 0.17])
|
PKG_CHECK_MODULES(FTPFS, [fuse >= 2.2 glib-2.0 libcurl >= 0.17])
|
||||||
CFLAGS="$CFLAGS -Wall -W -D_REENTRANT $FTPFS_CFLAGS"
|
CFLAGS="$CFLAGS -Wall -W -D_REENTRANT $FTPFS_CFLAGS"
|
||||||
@@ -14,5 +15,5 @@ if test "$have_fuse_opt_parse" = no; then
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
|
AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile compat/Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
Reference in New Issue
Block a user