From 0edb229552100bd789feb810488ca7d6f22d3e35 Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Thu, 6 Nov 2003 11:11:24 +0000 Subject: [PATCH] Fix build process so that libntfs-gnomevfs is linked against libntfs properly using libtool. (Logical change 1.225) --- libntfs/Makefile.am | 6 ++++-- libntfs/Makefile.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am index 887f42c1..c7c49d3f 100644 --- a/libntfs/Makefile.am +++ b/libntfs/Makefile.am @@ -25,7 +25,7 @@ # - If the interface is the same as the previous version, change to C:R+1:A # -LTVERSION = 5:0:0 +LTVERSION_LIBNTFS = 5:0:0 LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0 @@ -44,8 +44,9 @@ AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag) endif linux_ntfsincludedir = -I$(top_srcdir)/include + lib_LTLIBRARIES = libntfs.la -libntfs_la_LDFLAGS = -version-info $(LTVERSION) +libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) libntfs_la_SOURCES = \ attrib.c \ bitmap.c \ @@ -67,6 +68,7 @@ gnomevfsmoduleslibdir = $(libdir)/gnome-vfs-2.0/modules gnomevfsmoduleslib_LTLIBRARIES = libntfs-gnomevfs.la libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS) +libntfs_gnomevfs_la_LIBADD = libntfs.la libntfs_gnomevfs_la_SOURCES = \ gnome-vfs-method.c \ gnome-vfs-module.c diff --git a/libntfs/Makefile.in b/libntfs/Makefile.in index b5c6f4e4..ffae640e 100644 --- a/libntfs/Makefile.in +++ b/libntfs/Makefile.in @@ -127,7 +127,7 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ -LTVERSION = 5:0:0 +LTVERSION_LIBNTFS = 5:0:0 LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0 # Later gcc require -fms-extensions to work. @@ -139,8 +139,9 @@ LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0 @DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag) linux_ntfsincludedir = -I$(top_srcdir)/include + lib_LTLIBRARIES = libntfs.la -libntfs_la_LDFLAGS = -version-info $(LTVERSION) +libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) libntfs_la_SOURCES = \ attrib.c \ bitmap.c \ @@ -163,6 +164,7 @@ gnomevfsmoduleslibdir = $(libdir)/gnome-vfs-2.0/modules gnomevfsmoduleslib_LTLIBRARIES = libntfs-gnomevfs.la libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS) +libntfs_gnomevfs_la_LIBADD = libntfs.la libntfs_gnomevfs_la_SOURCES = \ gnome-vfs-method.c \ gnome-vfs-module.c @@ -180,7 +182,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = libntfs.conf LTLIBRARIES = $(gnomevfsmoduleslib_LTLIBRARIES) $(lib_LTLIBRARIES) -libntfs_gnomevfs_la_LIBADD = +libntfs_gnomevfs_la_DEPENDENCIES = libntfs.la am_libntfs_gnomevfs_la_OBJECTS = gnome-vfs-method.lo gnome-vfs-module.lo libntfs_gnomevfs_la_OBJECTS = $(am_libntfs_gnomevfs_la_OBJECTS) libntfs_la_LIBADD =