Accepting request 158007 from filesystems

- Use autoreconf directly instead of makeconf.sh

- Update to version 2.9.2
  - Add support for fallocate() (kernel >= 3.5)
  - Bug fixes
- Remove fix-pthread-in-fuse.pc.patch; now included in upstream
- Don't patch generated files such as configure and Makefile.in;
  instead, regenerate them using makeconf.sh from SVN repository

OBS-URL: https://build.opensuse.org/request/show/158007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=56
This commit is contained in:
Stephan Kulow 2013-03-08 20:04:03 +00:00 committed by Git OBS Bridge
commit c951b9fbcf
8 changed files with 42 additions and 1498 deletions

View File

@ -1,126 +0,0 @@
From 384496dd02cfd9a74b95d62ce0d23a31a7af3730 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 16 May 2012 16:45:27 +0200
Subject: [PATCH] Fix -pthread in fuse.pc
Linking to a library that uses threads requires the application to be linked
with -pthreads otherwise some pthread functions will be linked to stubs in
glibc. So move -pthread from Libs.private to Libs in fuse.pc.
Reported by Werner Fink
---
ChangeLog | 7 +++++++
configure.in | 5 ++---
fuse.pc.in | 2 +-
lib/Makefile.am | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
Index: fuse-2.9.0/ChangeLog
===================================================================
--- fuse-2.9.0.orig/ChangeLog 2012-04-20 16:29:19.000000000 +0200
+++ fuse-2.9.0/ChangeLog 2012-07-02 09:29:09.904005554 +0200
@@ -1,3 +1,10 @@
+2012-05-16 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Linking to a library that uses threads requires the application
+ to be linked with -pthreads otherwise some pthread functions will
+ be linked to stubs in glibc. So move -pthread from Libs.private
+ to Libs in fuse.pc. Reported by Werner Fink
+
2012-04-20 Miklos Szeredi <miklos@szeredi.hu>
* Released 2.9.0
Index: fuse-2.9.0/configure.in
===================================================================
--- fuse-2.9.0.orig/configure.in 2012-07-02 09:27:31.886602524 +0200
+++ fuse-2.9.0/configure.in 2012-07-02 09:29:09.915005039 +0200
@@ -62,11 +62,10 @@ AC_CHECK_FUNCS([fork setxattr fdatasync
AC_CHECK_MEMBERS([struct stat.st_atim])
AC_CHECK_MEMBERS([struct stat.st_atimespec])
-libfuse_libs="-pthread"
LIBS=
AC_SEARCH_LIBS(dlopen, [dl])
AC_SEARCH_LIBS(clock_gettime, [rt])
-libfuse_libs="$libfuse_libs $LIBS"
+libfuse_libs=$LIBS
LIBS=
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
@@ -76,7 +75,7 @@ AC_ARG_WITH([libiconv-prefix],
done
])
AM_ICONV
-libfuse_libs="$libfuse_libs $LTLIBICONV"
+libfuse_libs=$libfuse_libs $LTLIBICONV
AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
AC_SUBST(libfuse_libs)
Index: fuse-2.9.0/fuse.pc.in
===================================================================
--- fuse-2.9.0.orig/fuse.pc.in 2012-04-10 15:28:55.000000000 +0200
+++ fuse-2.9.0/fuse.pc.in 2012-07-02 09:29:09.915005039 +0200
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: fuse
Description: Filesystem in Userspace
Version: @VERSION@
-Libs: -L${libdir} -lfuse
+Libs: -L${libdir} -lfuse -pthread
Libs.private: @libfuse_libs@
Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64
Index: fuse-2.9.0/lib/Makefile.am
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.am 2012-04-20 12:01:56.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.am 2012-07-02 09:29:09.916004992 +0200
@@ -36,7 +36,7 @@ libfuse_la_SOURCES = \
$(iconv_source) \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:9:0 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:0 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
if NETBSD
Index: fuse-2.9.0/configure
===================================================================
--- fuse-2.9.0.orig/configure 2012-07-02 09:27:54.000000000 +0200
+++ fuse-2.9.0/configure 2012-07-02 09:29:47.969220381 +0200
@@ -12114,7 +12114,6 @@ _ACEOF
fi
-libfuse_libs="-pthread"
LIBS=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
$as_echo_n "checking for library containing dlopen... " >&6; }
@@ -12228,7 +12227,7 @@ if test "$ac_res" != no; then :
fi
-libfuse_libs="$libfuse_libs $LIBS"
+libfuse_libs=$LIBS
LIBS=
# Check whether --with-libiconv-prefix was given.
@@ -13205,7 +13204,7 @@ _ACEOF
fi
-libfuse_libs="$libfuse_libs $LTLIBICONV"
+libfuse_libs=$libfuse_libs $LTLIBICONV
if test "$am_cv_func_iconv" = yes; then
ICONV_TRUE=
ICONV_FALSE='#'
Index: fuse-2.9.0/lib/Makefile.in
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.in 2012-04-20 14:43:38.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.in 2012-07-02 09:29:51.589050623 +0200
@@ -283,7 +283,7 @@ libfuse_la_SOURCES = \
$(iconv_source) \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:9:0 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:0 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
@NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bf669e5388d4f256c7875079d5a6b97837bad23eb77a1cbc8b54b46a88315f2
size 558554

3
fuse-2.9.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc
size 560123

File diff suppressed because it is too large Load Diff

View File

@ -1,46 +1,13 @@
Index: util/Makefile.in
===================================================================
--- util/Makefile.in.orig
+++ util/Makefile.in
@@ -640,26 +640,14 @@ mount_util.c: $(top_srcdir)/lib/mount_ut
@cp $(top_srcdir)/lib/mount_util.c .
install-exec-hook:
- -chmod u+s $(DESTDIR)$(bindir)/fusermount
- @if test ! -e $(DESTDIR)/dev/fuse; then \
- $(mkdir_p) $(DESTDIR)/dev; \
- echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
- mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
- fi
install-exec-local:
$(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
- @if test -x /usr/sbin/update-rc.d; then \
- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
- fi
install-data-local:
- $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
- $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
uninstall-local:
rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
Index: util/Makefile.am
===================================================================
--- util/Makefile.am.orig
+++ util/Makefile.am
@@ -20,14 +20,6 @@ ulockmgr_server_SOURCES = ulockmgr_serve
--- fuse-2.9.2.orig/util/Makefile.am 2012-07-19 07:33:49.000000000 -0500
+++ fuse-2.9.2/util/Makefile.am 2013-03-04 09:23:23.000000000 -0600
@@ -20,14 +20,6 @@
ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT
ulockmgr_server_LDFLAGS = -pthread
-install-exec-hook:
- -chmod u+s $(DESTDIR)$(bindir)/fusermount
- @if test ! -e $(DESTDIR)/dev/fuse; then \
- $(mkdir_p) $(DESTDIR)/dev; \
- $(MKDIR_P) $(DESTDIR)/dev; \
- echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
- mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
- fi
@ -48,9 +15,9 @@ Index: util/Makefile.am
EXTRA_DIST = udev.rules init_script
MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
@@ -39,14 +31,8 @@ install-exec-local:
$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
@@ -39,14 +31,8 @@
$(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
- @if test -x /usr/sbin/update-rc.d; then \
- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
@ -58,7 +25,7 @@ Index: util/Makefile.am
- fi
install-data-local:
- $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
- $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH)
- $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
uninstall-local:

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Mar 8 13:36:12 UTC 2013 - idonmez@suse.com
- Use autoreconf directly instead of makeconf.sh
-------------------------------------------------------------------
Mon Mar 4 15:04:08 UTC 2013 - archie@dellroad.org
- Update to version 2.9.2
- Add support for fallocate() (kernel >= 3.5)
- Bug fixes
- Remove fix-pthread-in-fuse.pc.patch; now included in upstream
- Don't patch generated files such as configure and Makefile.in;
instead, regenerate them using makeconf.sh from SVN repository
-------------------------------------------------------------------
Sat Feb 2 18:50:24 UTC 2013 - coolo@suse.com

View File

@ -20,16 +20,15 @@ Name: fuse
Summary: User space File System
License: GPL-2.0+ and LGPL-2.1+
Group: System/Filesystems
Version: 2.9.0
Version: 2.9.2
Release: 0
# http://downloads.sf.net/fuse/fuse-%%version.tar.gz
Source: %{name}-%{version}.tar.gz
Source2: fuse.rpmlintrc
Source3: baselibs.conf
Patch: fuse-install-fix.diff
Patch3: fuse-gnu_source.patch
Patch4: fusermount-compile-as-pie.patch
Patch5: fix-pthread-in-fuse.pc.patch
Patch2: fuse-gnu_source.patch
Patch3: fusermount-compile-as-pie.patch
Url: http://fuse.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1130
@ -37,6 +36,9 @@ Requires: util-linux >= 2.18
%else
Requires: util-linux(fake+no-canonicalize)
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1000
Supplements: filesystem(fuse)
@ -135,14 +137,14 @@ http://fuse.sourceforge.net/wiki
%prep
%setup -q
%patch
%patch3
%patch4 -p1
%patch5 -p1
%patch -p1
%patch2 -p1
%patch3 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"
export MOUNT_FUSE_PATH=%{_sbindir}
autoreconf -fi
%configure --with-pic \
--with-pkgconfigdir=%{_libdir}/pkgconfig \
--enable-lib \

View File

@ -11,80 +11,3 @@ Index: fuse-2.9.0/util/Makefile.am
BUILT_SOURCES = mount_util.c
mount_util.c: $(top_srcdir)/lib/mount_util.c
@cp $(top_srcdir)/lib/mount_util.c .
Index: fuse-2.9.0/util/Makefile.in
===================================================================
--- fuse-2.9.0.orig/util/Makefile.in 2012-07-02 09:27:27.000000000 +0200
+++ fuse-2.9.0/util/Makefile.in 2012-07-02 09:28:54.629721894 +0200
@@ -59,6 +59,9 @@ fusermount_LDADD = $(LDADD)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
+fusermount_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fusermount_CFLAGS) \
+ $(CFLAGS) $(fusermount_LDFLAGS) $(LDFLAGS) -o $@
am_mount_fuse_OBJECTS = mount.fuse.$(OBJEXT)
mount_fuse_OBJECTS = $(am_mount_fuse_OBJECTS)
mount_fuse_LDADD = $(LDADD)
@@ -237,6 +240,8 @@ AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64
# copying it over.
fusermount_SOURCES = fusermount.c mount_util.c
fusermount_CPPFLAGS = -I$(top_srcdir)/lib
+fusermount_CFLAGS = -fPIE $(AM_CFLAGS)
+fusermount_LDFLAGS = -pie $(AM_LDFLAGS)
BUILT_SOURCES = mount_util.c
mount_fuse_SOURCES = mount.fuse.c
ulockmgr_server_SOURCES = ulockmgr_server.c
@@ -332,7 +337,7 @@ clean-noinstPROGRAMS:
rm -f $$list
fusermount$(EXEEXT): $(fusermount_OBJECTS) $(fusermount_DEPENDENCIES)
@rm -f fusermount$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(fusermount_OBJECTS) $(fusermount_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(fusermount_LINK) $(fusermount_OBJECTS) $(fusermount_LDADD) $(LIBS)
mount.fuse$(EXEEXT): $(mount_fuse_OBJECTS) $(mount_fuse_DEPENDENCIES)
@rm -f mount.fuse$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mount_fuse_OBJECTS) $(mount_fuse_LDADD) $(LIBS)
@@ -376,36 +381,36 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
fusermount-fusermount.o: fusermount.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.o -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.o -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-fusermount.Tpo $(DEPDIR)/fusermount-fusermount.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fusermount.c' object='fusermount-fusermount.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
fusermount-fusermount.obj: fusermount.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.obj -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.obj -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-fusermount.Tpo $(DEPDIR)/fusermount-fusermount.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fusermount.c' object='fusermount-fusermount.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
fusermount-mount_util.o: mount_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.o -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.o -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-mount_util.Tpo $(DEPDIR)/fusermount-mount_util.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_util.c' object='fusermount-mount_util.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
fusermount-mount_util.obj: mount_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.obj -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.obj -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-mount_util.Tpo $(DEPDIR)/fusermount-mount_util.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_util.c' object='fusermount-mount_util.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
ulockmgr_server-ulockmgr_server.o: ulockmgr_server.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ulockmgr_server_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ulockmgr_server-ulockmgr_server.o -MD -MP -MF $(DEPDIR)/ulockmgr_server-ulockmgr_server.Tpo -c -o ulockmgr_server-ulockmgr_server.o `test -f 'ulockmgr_server.c' || echo '$(srcdir)/'`ulockmgr_server.c