* Fix out-of-source build.

diff --git a/ChangeLog b/ChangeLog
index 083bce49cc090857b067bdd221abc9d5c40e49f5..1cf821e8d851a4485d1e7d09a0922a54a19742e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-15  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix out-of-source build.  Patch by Jörg Faschingbauer
+
 2010-05-10  Miklos Szeredi <miklos@szeredi.hu>
 
        * Remove "chmod root" from install of fusermount.  Reported by

diff --git a/util/.cvsignore b/util/.cvsignore
index 85b4a7110cb1def3dba8bf3a20b2651757357bdd..1f7f4324a1e6f67e258a9054ad016e8f77516f69 100644 (file)
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -6,3 +6,4 @@ fusermount
 ulockmgr_server
 fuse_ioslave
 mount.fuse
+mount_util.c

diff --git a/util/Makefile.am b/util/Makefile.am
index b9bcdaab9a4947fadf1a2b22ed2815c9ec519338..927b98c07fdb6442b6b3bd2f8c820e780869c2e6 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,9 +4,16 @@ AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 bin_PROGRAMS = fusermount ulockmgr_server
 noinst_PROGRAMS = mount.fuse
 
-fusermount_SOURCES = fusermount.c
-fusermount_LDADD = ../lib/mount_util.lo
-fusermount_CPPFLAGS = -I../lib
+# we re-use mount_util.c from the library, but do want to keep ourself
+# as stand-alone as possible. in order to make an out-of-source build
+# possible, we "generate" the file from its original location by
+# copying it over.
+fusermount_SOURCES = fusermount.c mount_util.c
+fusermount_CPPFLAGS = -I$(top_srcdir)/lib
+BUILT_SOURCES = mount_util.c
+mount_util.c: $(top_srcdir)/lib/mount_util.c
+       @cp $(top_srcdir)/lib/mount_util.c .
+
 mount_fuse_SOURCES = mount.fuse.c
 
 ulockmgr_server_SOURCES = ulockmgr_server.c