From d73e646b33652c28913ddc7cc8c45a9cacbab2b7 Mon Sep 17 00:00:00 2001 From: szaka Date: Mon, 19 May 2008 17:34:39 +0000 Subject: [PATCH] fix: support build in a separate directory (Alon Bar-Lev) --- Makefile.am | 28 ++++++++++++++-------------- include/Makefile.am | 2 +- include/fuse-lite/Makefile.am | 2 +- include/ntfs-3g/Makefile.am | 2 +- libfuse-lite/Makefile.am | 2 +- libntfs-3g/Makefile.am | 4 ++-- src/Makefile.am | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3cfc6525..1208f18c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,20 +4,20 @@ AUTOMAKE_OPTIONS = gnu EXTRA_DIST = AUTHORS CREDITS COPYING NEWS autogen.sh MAINTAINERCLEANFILES=\ - configure \ - Makefile.in \ - aclocal.m4 \ - compile \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - config.guess \ - config.sub \ - config.h.in \ - config.h.in~ \ - INSTALL + $(srcdir)/configure \ + $(srcdir)/Makefile.in \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/compile \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/config.guess \ + $(srcdir)/config.sub \ + $(srcdir)/config.h.in \ + $(srcdir)/config.h.in~ \ + $(srcdir)/INSTALL -SUBDIRS= include libfuse-lite libntfs-3g src +SUBDIRS = include libfuse-lite libntfs-3g src doc_DATA = README diff --git a/include/Makefile.am b/include/Makefile.am index 53bbe609..0fa17025 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in SUBDIRS = ntfs-3g fuse-lite diff --git a/include/fuse-lite/Makefile.am b/include/fuse-lite/Makefile.am index 15a84bbf..7c18dea4 100644 --- a/include/fuse-lite/Makefile.am +++ b/include/fuse-lite/Makefile.am @@ -1,5 +1,5 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in noinst_HEADERS = \ fuse.h \ diff --git a/include/ntfs-3g/Makefile.am b/include/ntfs-3g/Makefile.am index 870ec2a5..89f46bf5 100644 --- a/include/ntfs-3g/Makefile.am +++ b/include/ntfs-3g/Makefile.am @@ -1,5 +1,5 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in if INSTALL_LIBRARY ntfs3ginclude_HEADERS = \ diff --git a/libfuse-lite/Makefile.am b/libfuse-lite/Makefile.am index 9e73d4e8..baac0bb3 100644 --- a/libfuse-lite/Makefile.am +++ b/libfuse-lite/Makefile.am @@ -1,5 +1,5 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in if FUSE_INTERNAL noinst_LTLIBRARIES = libfuse-lite.la diff --git a/libntfs-3g/Makefile.am b/libntfs-3g/Makefile.am index f2df582d..6ac7eea6 100644 --- a/libntfs-3g/Makefile.am +++ b/libntfs-3g/Makefile.am @@ -1,5 +1,5 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in if INSTALL_LIBRARY rootlib_LTLIBRARIES=#Create directory @@ -14,7 +14,7 @@ libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined if FUSE_INTERNAL -libntfs_3g_la_LIBADD = $(top_srcdir)/libfuse-lite/libfuse-lite.la +libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la endif libntfs_3g_la_SOURCES = \ diff --git a/src/Makefile.am b/src/Makefile.am index c7da069c..ee4cd81d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in if FUSE_INTERNAL FUSE_CFLAGS = -I$(top_srcdir)/include/fuse-lite