opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split off ntfsprogs-gnomevfs in separate rpm and move glib/gnome 

dependencies to it.

(Logical change 1.230)
edge.strict_endians
cantab.net!aia21 2003-11-07 10:16:00 +00:00
parent 6f459a9a64
commit 912e86e813
9 changed files with 734 additions and 1381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -83,6 +83,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GOBJECT_QUERY = @GOBJECT_QUERY@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
@ -120,9 +122,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \
configure configure.ac depcomp install-sh ltconfig ltmain.sh \
missing mkinstalldirs ntfsprogs.spec.in
Makefile.in NEWS aclocal.m4 compile config.guess config.h.in \
config.sub configure configure.ac depcomp install-sh ltconfig \
ltmain.sh missing mkinstalldirs ntfsprogs.spec.in
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

2003
configure vendored
View File

File diff suppressed because it is too large Load Diff

17
configure.ac
View File

@ -66,11 +66,6 @@ if test "$USE_MAINTAINER_MODE" = "yes";then
CFLAGS="$CFLAGS -ggdb3 -Wall -Wstrict-prototypes -Wsign-compare" ## FIXME: fix all source: -Wsign-compare
fi
AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Linux-NTFS Gnome VFS module requires glib-2.0 library.])],[gmodule gobject])
dnl Force glib-2.0 for the whole package
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
# Checks for programs.
AC_PROG_CXX
AC_PROG_CC
@ -79,10 +74,15 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Linux-NTFS Gnome VFS module requires glib-2.0 library.])],[gmodule gobject])
dnl Force glib-2.0 for the whole package
LIBNTFS_GNOMEVFS_CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBNTFS_GNOMEVFS_LIBS="$LIBS $GLIB_LIBS"
PKG_CHECK_MODULES(GNOME_VFS_MODULE,gnome-vfs-module-2.0)
dnl Force gnome-vfs-module-2.0 for the whole package
CFLAGS="$CFLAGS $GNOME_VFS_MODULE_CFLAGS"
LIBS="$LIBS $GNOME_VFS_MODULE_LIBS"
LIBNTFS_GNOMEVFS_CFLAGS="$LIBNTFS_GNOMEVFS_CFLAGS $CFLAGS $GNOME_VFS_MODULE_CFLAGS"
LIBNTFS_GNOMEVFS_LIBS="$LIBNTFS_GNOMEVFS_LIBS $LIBS $GNOME_VFS_MODULE_LIBS"
# create a working libtool-script
if test -z "$LIBTOOL"; then
@ -107,6 +107,9 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
AC_SUBST(LIBNTFS_GNOMEVFS_CFLAGS)
AC_SUBST(LIBNTFS_GNOMEVFS_LIBS)
AC_SUBST(AUTODIRS)
# Get compiler name

2
doc/Makefile.in
View File

@ -83,6 +83,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GOBJECT_QUERY = @GOBJECT_QUERY@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@

2
include/Makefile.in
View File

@ -83,6 +83,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GOBJECT_QUERY = @GOBJECT_QUERY@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@

2
libntfs/Makefile.am
View File

@ -69,6 +69,8 @@ gnomevfsmoduleslib_LTLIBRARIES = libntfs-gnomevfs.la
libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS)
libntfs_gnomevfs_la_LIBADD = libntfs.la
libntfs_gnomevfs_la_LIBS = $(LIBNTFS_GNOMEVFS_LIBS)
libntfs_gnomevfs_la_CFLAGS = $(LIBNTFS_GNOMEVFS_CFLAGS)
libntfs_gnomevfs_la_SOURCES = \
gnome-vfs-method.c \
gnome-vfs-module.c

53
libntfs/Makefile.in
View File

@ -110,6 +110,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GOBJECT_QUERY = @GOBJECT_QUERY@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
@ -165,6 +167,8 @@ gnomevfsmoduleslib_LTLIBRARIES = libntfs-gnomevfs.la
libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS)
libntfs_gnomevfs_la_LIBADD = libntfs.la
libntfs_gnomevfs_la_LIBS = $(LIBNTFS_GNOMEVFS_LIBS)
libntfs_gnomevfs_la_CFLAGS = $(LIBNTFS_GNOMEVFS_CFLAGS)
libntfs_gnomevfs_la_SOURCES = \
gnome-vfs-method.c \
gnome-vfs-module.c
@ -185,7 +189,8 @@ CONFIG_CLEAN_FILES = libntfs.conf libntfs-gnomevfs.8
LTLIBRARIES = $(gnomevfsmoduleslib_LTLIBRARIES) $(lib_LTLIBRARIES)
libntfs_gnomevfs_la_DEPENDENCIES = libntfs.la
am_libntfs_gnomevfs_la_OBJECTS = gnome-vfs-method.lo gnome-vfs-module.lo
am_libntfs_gnomevfs_la_OBJECTS = libntfs_gnomevfs_la-gnome-vfs-method.lo \
libntfs_gnomevfs_la-gnome-vfs-module.lo
libntfs_gnomevfs_la_OBJECTS = $(am_libntfs_gnomevfs_la_OBJECTS)
libntfs_la_LIBADD =
am_libntfs_la_OBJECTS = attrib.lo bitmap.lo bootsect.lo compat.lo \
@ -201,9 +206,9 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/bootsect.Plo ./$(DEPDIR)/compat.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/debug.Plo ./$(DEPDIR)/device.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/device_io.Plo ./$(DEPDIR)/dir.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-method.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-module.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/inode.Plo ./$(DEPDIR)/lcnalloc.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/mft.Plo ./$(DEPDIR)/mst.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/runlist.Plo ./$(DEPDIR)/unistr.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/volume.Plo
@ -293,6 +298,8 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libntfs_gnomevfs_la-gnome-vfs-method.lo: gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-module.lo: gnome-vfs-module.c
libntfs-gnomevfs.la: $(libntfs_gnomevfs_la_OBJECTS) $(libntfs_gnomevfs_la_DEPENDENCIES)
$(LINK) -rpath $(gnomevfsmoduleslibdir) $(libntfs_gnomevfs_la_LDFLAGS) $(libntfs_gnomevfs_la_OBJECTS) $(libntfs_gnomevfs_la_LIBADD) $(LIBS)
libntfs.la: $(libntfs_la_OBJECTS) $(libntfs_la_DEPENDENCIES)
@ -312,10 +319,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device_io.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-method.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-module.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inode.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcnalloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mft.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mst.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runlist.Plo@am__quote@
@ -342,6 +349,42 @@ distclean-depend:
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
libntfs_gnomevfs_la-gnome-vfs-method.o: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.o `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-method.obj: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.obj `cygpath -w gnome-vfs-method.c`
libntfs_gnomevfs_la-gnome-vfs-method.lo: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-module.o: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.o `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
libntfs_gnomevfs_la-gnome-vfs-module.obj: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.obj `cygpath -w gnome-vfs-module.c`
libntfs_gnomevfs_la-gnome-vfs-module.lo: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
CCDEPMODE = @CCDEPMODE@
mostlyclean-libtool:

26
ntfsprogs.spec.in
View File

@ -28,6 +28,32 @@ ntfsresize, and ntfsundelete (for a full list of included utilities see man
Summary : NTFS GNOME virtual filesystem module
Group : System Environment/Base
Requires : ntfsprogs = %{ver}-%{rel}
Requires : libbonobo-activation.so.4
Requires : libcom_err.so.3
Requires : libcrypto.so.4
Requires : libdl.so.2
Requires : libgconf-2.so.4
Requires : libglib-2.0.so.0
Requires : libgmodule-2.0.so.0
Requires : libgnomevfs-2.so.0
Requires : libgobject-2.0.so.0
Requires : libgssapi_krb5.so.2
Requires : libgthread-2.0.so.0
Requires : libk5crypto.so.3
Requires : libkrb5.so.3
Requires : liblinc.so.1
Requires : libm.so.6
Requires : libORBit-2.so.0
Requires : libpthread.so.0
Requires : libpthread.so.0(GLIBC_2.0)
Requires : libpthread.so.0(GLIBC_2.2)
Requires : libresolv.so.2
Requires : librt.so.1
Requires : libssl.so.4
Requires : libxml2.so.2
Requires : libz.so.1
%description gnomevfs
This package contains the NTFS GNOME virtual filesystem (VFS) module which
allows GNOME VFS clients to seamlessly utilize the NTFS library.

2
ntfsprogs/Makefile.in
View File

@ -83,6 +83,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GOBJECT_QUERY = @GOBJECT_QUERY@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@