summaryrefslogtreecommitdiff
path: root/src/rofiles-fuse/Makefile-inc.am
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-12-14 11:05:00 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-05 21:04:39 +0000
commit46a841a062936f35cefaae5a4dbbb989859fc471 (patch)
tree4f121798b901e3cce28bd327a924bb4439e037ec /src/rofiles-fuse/Makefile-inc.am
parent994cd66744e559c92644f36028c6c262605ad75a (diff)
downloadostree-46a841a062936f35cefaae5a4dbbb989859fc471.tar.gz
rofiles: Add --copyup option
Sadly https://sourceware.org/bugzilla/show_bug.cgi?id=22089 is I think going to actually force us to cave here. Even if we got the glibc patch in today, we need to support the RHEL glibc. See also discussion about fish as part of the general Fedora tracker. This is basically needed to unblock rpm-ostree unified core 🌐: https://github.com/projectatomic/rpm-ostree/issues/729 Closes: https://github.com/ostreedev/ostree/issues/1377 Closes: #1382 Approved by: jlebon
Diffstat (limited to 'src/rofiles-fuse/Makefile-inc.am')
-rw-r--r--src/rofiles-fuse/Makefile-inc.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rofiles-fuse/Makefile-inc.am b/src/rofiles-fuse/Makefile-inc.am
index 5510a2bd..6754aa70 100644
--- a/src/rofiles-fuse/Makefile-inc.am
+++ b/src/rofiles-fuse/Makefile-inc.am
@@ -19,5 +19,7 @@ bin_PROGRAMS += rofiles-fuse
rofiles_fuse_SOURCES = src/rofiles-fuse/main.c
-rofiles_fuse_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(BUILDOPT_FUSE_CFLAGS) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/libglnx $(NULL)
-rofiles_fuse_LDADD = libglnx.la $(BUILDOPT_FUSE_LIBS) $(OT_INTERNAL_GIO_UNIX_LIBS)
+rofiles_fuse_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(BUILDOPT_FUSE_CFLAGS) \
+ $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I $(srcdir)/src/libostree -I $(builddir)/src/libostree \
+ -I$(srcdir)/libglnx
+rofiles_fuse_LDADD = libglnx.la $(BUILDOPT_FUSE_LIBS) $(OT_INTERNAL_GIO_UNIX_LIBS) libostree-1.la