Rename: client/libcaptive-gnomevfs/ -> client/gnomevfs/

diff --git a/autogen.pl b/autogen.pl
index a5a32ef..805292c 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -44,7 +44,7 @@ AutoGen->run(
                                ./src/client/bug-replay/captive-bug-replay
                                ./src/client/cmdline/captive-cmdline
                                ./src/client/sandbox-server/captive-sandbox-server
-                               ./src/client/libcaptive-gnomevfs/captive.conf
+                               ./src/client/gnomevfs/captive.conf
                                ./src/libcaptive/cc/marshallers.[ch]
                                ./src/libcaptive/ke/exports.c
                                ./src/libcaptive/reactos/*/*.[cS]

diff --git a/configure.in b/configure.in
index 5473273..e976f95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -272,13 +272,13 @@ Makefile
 ./src/client/Makefile
 ./src/client/bug-replay/Makefile
 ./src/client/cmdline/Makefile
-./src/client/libcaptive-gnomevfs/Makefile
+./src/client/gnomevfs/Makefile
 ./src/client/lufs/Makefile
 ./src/client/sandbox-server/Makefile
 ./src/TraceFS/Makefile
 ./doc/Makefile
 ./doc/apiref/Makefile
-./src/client/libcaptive-gnomevfs/captive.conf
+./src/client/gnomevfs/captive.conf
 ])
 
 dnl FIXME: Why is "po/POTFILES" being substituted?

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index ef25a5a..08574d6 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -18,4 +18,4 @@
 
 include $(top_srcdir)/Makefile-head.am
 
-SUBDIRS=cmdline sandbox-server lufs libcaptive-gnomevfs bug-replay
+SUBDIRS=cmdline sandbox-server lufs gnomevfs bug-replay

diff --git a/src/client/gnomevfs/Makefile.am b/src/client/gnomevfs/Makefile.am
index 4be2184..7c15c6c 100644 (file)
--- a/src/client/gnomevfs/Makefile.am
+++ b/src/client/gnomevfs/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# automake source for the libcaptive-gnomevfs module for gnome-vfs2 Makefile 
+# automake source for the gnomevfs module for gnome-vfs2 Makefile 
 # Copyright (C) 2002-2003 Jan Kratochvil <project-captive@jankratochvil.net>
 # 
 # This program is free software; you can redistribute it and/or modify

diff --git a/src/client/libcaptive-gnomevfs/captive.conf.in b/src/client/gnomevfs/captive.conf.in
similarity index 100%
rename from src/client/libcaptive-gnomevfs/captive.conf.in
rename to src/client/gnomevfs/captive.conf.in

diff --git a/src/client/libcaptive-gnomevfs/giognomevfs.c b/src/client/gnomevfs/giognomevfs.c
similarity index 100%
rename from src/client/libcaptive-gnomevfs/giognomevfs.c
rename to src/client/gnomevfs/giognomevfs.c

diff --git a/src/client/libcaptive-gnomevfs/giognomevfs.h b/src/client/gnomevfs/giognomevfs.h
similarity index 100%
rename from src/client/libcaptive-gnomevfs/giognomevfs.h
rename to src/client/gnomevfs/giognomevfs.h

diff --git a/src/client/libcaptive-gnomevfs/gnome-vfs-method.c b/src/client/gnomevfs/gnome-vfs-method.c
similarity index 100%
rename from src/client/libcaptive-gnomevfs/gnome-vfs-method.c
rename to src/client/gnomevfs/gnome-vfs-method.c

diff --git a/src/client/libcaptive-gnomevfs/gnome-vfs-method.h b/src/client/gnomevfs/gnome-vfs-method.h
similarity index 100%
rename from src/client/libcaptive-gnomevfs/gnome-vfs-method.h
rename to src/client/gnomevfs/gnome-vfs-method.h

diff --git a/src/client/libcaptive-gnomevfs/gnome-vfs-module.c b/src/client/gnomevfs/gnome-vfs-module.c
similarity index 100%
rename from src/client/libcaptive-gnomevfs/gnome-vfs-module.c
rename to src/client/gnomevfs/gnome-vfs-module.c

diff --git a/src/client/libcaptive-gnomevfs/gnome-vfs-module.h b/src/client/gnomevfs/gnome-vfs-module.h
similarity index 100%
rename from src/client/libcaptive-gnomevfs/gnome-vfs-module.h
rename to src/client/gnomevfs/gnome-vfs-module.h

diff --git a/src/client/libcaptive-gnomevfs/Makefile.am b/src/client/libcaptive-gnomevfs/Makefile.am
deleted file mode 100644 (file)
index 4be2184..0000000
--- a/src/client/libcaptive-gnomevfs/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-# automake source for the libcaptive-gnomevfs module for gnome-vfs2 Makefile 
-# Copyright (C) 2002-2003 Jan Kratochvil <project-captive@jankratochvil.net>
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; exactly version 2 of June 1991 is required
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-include $(top_srcdir)/Makefile-head.am
-include $(top_srcdir)/src/libcaptive/Makefile-libcaptive.am
-
-gnomevfsmoduleslibdir=$(libdir)/gnome-vfs-2.0/modules
-gnomevfsmoduleslib_LTLIBRARIES=libcaptive-gnomevfs.la
-
-libcaptive_gnomevfs_la_CFLAGS=                   $(GNOME_VFS_MODULE_CFLAGS) $(LIBXML_CFLAGS)
-libcaptive_gnomevfs_la_LIBADD=$(captive_library) $(GNOME_VFS_MODULE_LIBS)
-libcaptive_gnomevfs_la_LDFLAGS=-release $(VERSION)
-libcaptive_gnomevfs_la_SOURCES= \
-               giognomevfs.c \
-               giognomevfs.h \
-               gnome-vfs-method.c \
-               gnome-vfs-method.h \
-               gnome-vfs-module.c \
-               gnome-vfs-module.h
-
-gnomevfsmodulesconfdir=$(sysconfdir)/gnome-vfs-2.0/modules
-gnomevfsmodulesconf_DATA=captive.conf
-EXTRA_DIST+=captive.conf.in