Use 'gnome-vfs-2.0' instead of 'gnome-vfs-module-2.0' where appropriate.

diff --git a/src/client/bug-replay/Makefile.am b/src/client/bug-replay/Makefile.am
index b7086ca..a844224 100644 (file)
--- a/src/client/bug-replay/Makefile.am
+++ b/src/client/bug-replay/Makefile.am
@@ -20,8 +20,8 @@ include $(top_srcdir)/Makefile-head.am
 
 captive_bug_replay_SOURCES= \
                main.c
-captive_bug_replay_CFLAGS=                   $(LIBXML_CFLAGS) $(GNOME_VFS_MODULE_CFLAGS)
-captive_bug_replay_LDADD =$(captive_library) $(LIBXML_LIBS)
+captive_bug_replay_CFLAGS=                   $(LIBXML_CFLAGS) $(GNOME_VFS_CFLAGS)
+captive_bug_replay_LDADD =$(captive_library) $(LIBXML_LIBS)   $(GNOME_VFS_LIBS)
 
 if HAVE_LIBXML_BUFFERING
 captive_bug_replay_cond=captive-bug-replay

diff --git a/src/client/cmdline/Makefile.am b/src/client/cmdline/Makefile.am
index b1d78e9..5712f68 100644 (file)
--- a/src/client/cmdline/Makefile.am
+++ b/src/client/cmdline/Makefile.am
@@ -53,7 +53,7 @@ captive_cmdline_SOURCES= \
                file_info.h \
                main.c \
                main.h
-captive_cmdline_CFLAGS=$(GNOME_VFS_MODULE_CFLAGS)
+captive_cmdline_CFLAGS=                   $(GNOME_VFS_CFLAGS)
+captive_cmdline_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
 captive_cmdline_LDFLAGS=$(READLINE_LDFLAGS)
-captive_cmdline_LDADD=$(captive_library) $(READLINE_LIBS) $(GNOME_VFS_MODULE_LIBS) $(INTLLIBS)
 bin_PROGRAMS+=captive-cmdline

diff --git a/src/client/lufs/Makefile.am b/src/client/lufs/Makefile.am
index 5ff308e..b0782dd 100644 (file)
--- a/src/client/lufs/Makefile.am
+++ b/src/client/lufs/Makefile.am
@@ -19,8 +19,8 @@
 include $(top_srcdir)/Makefile-head.am
 include $(top_srcdir)/src/libcaptive/Makefile-libcaptive.am
 
-liblufs_captivefs_la_CFLAGS=                   $(GNOME_VFS_MODULE_CFLAGS) $(LIBXML_CFLAGS)
-liblufs_captivefs_la_LIBADD=$(captive_library) $(GNOME_VFS_MODULE_LIBS)
+liblufs_captivefs_la_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS)
+liblufs_captivefs_la_LIBADD=$(captive_library) $(GNOME_VFS_LIBS)
 liblufs_captivefs_la_LDFLAGS=-release $(VERSION)
 liblufs_captivefs_la_SOURCES= \
                captivefs-attr.c \