build shared library

diff --git a/.cvsignore b/.cvsignore
index f4ad18c640d07cccb2de2d9f1cd5188d65f2d562..655867effcc571760f3e57b2dfad12b80760a620 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ config.log
 *.cache
 config.status
 depcomp
+libtool

diff --git a/ChangeLog b/ChangeLog
index c5c5a5a01b60d8a32728e8162857b5e98bc6cac1..f9c6a857de667c70603027aeb871ac4e4c58af8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-03  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Build shared library as well as static (using libtool)
+
+       * Change FUSE_MINOR_VERSION from 1 to 0.  I know it's illegal but
+       there has not been a release with the previous minor number, and I
+       hope nobody is using it for anything.
+       
 2004-05-18  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Added flush() call

diff --git a/configure.in b/configure.in
index c6744bd9ddc67d0d134fa554e297bb793a75a08a..c9b25183efb842ed4cee61d112f7fabaa07545e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_INIT_AUTOMAKE(fuse, 1.1)
 AM_CONFIG_HEADER(include/config.h)
 
 AC_PROG_CC
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 if test -z "$LD"; then
        LD=ld

diff --git a/example/.cvsignore b/example/.cvsignore
index e4188bc1b8b8b957c9ad0aa82f6e3023d3b56abd..f9c78843604f1974ff9cc4056c910e27391e440b 100644 (file)
--- a/example/.cvsignore
+++ b/example/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 fusexmp
 null
 hello
+.libs

diff --git a/example/Makefile.am b/example/Makefile.am
index a3880fa46c55189f0c5b0413d79c3c0a849b716e..475cabf10854514aa363433779562245fb236bc5 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -6,4 +6,4 @@ fusexmp_SOURCES = fusexmp.c
 null_SOURCES = null.c
 hello_SOURCES = hello.c
 
-LDADD = ../lib/libfuse.a -lpthread
+LDADD = ../lib/libfuse.la

diff --git a/include/fuse.h b/include/fuse.h
index 3babaf6fbdc8301bc489fb2b27fb2271a42c6f9b..e3e433347ad5922d5c472c0212bcca91327b76ad 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -15,7 +15,7 @@
 #define FUSE_MAJOR_VERSION 2
 
 /** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 1
+#define FUSE_MINOR_VERSION 0
 
 /* This interface uses 64 bit off_t */
 #if _FILE_OFFSET_BITS != 64

diff --git a/lib/.cvsignore b/lib/.cvsignore
index e440fafdac7e4118945ec8f88caf4069a6e0c10a..dc4caac801349e2cc3faff32b088db209fc987d2 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,3 +1,6 @@
 Makefile.in
 Makefile
 .deps
+.libs
+*.lo
+*.la

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 04d703949b50ae8e27704ec15f95a2c30f1ad37e..64385be4c3ef779bd82c82f3f26fceea232b8185 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-lib_LIBRARIES = libfuse.a
+lib_LTLIBRARIES = libfuse.la
 
-libfuse_a_SOURCES =    \
+libfuse_la_SOURCES =   \
        fuse.c          \
        fuse_mt.c       \
        helper.c        \
        mount.c         \
        fuse_i.h
+
+libfuse_la_LDFLAGS = -lpthread -version-number 2:0:0

diff --git a/makeconf.sh b/makeconf.sh
index 8cd29ad9419020860ffee86fad92d8b7d9d4eed6..ab11b9b46b6a51ba606c16c58fb4f13b9b4e532f 100755 (executable)
--- a/makeconf.sh
+++ b/makeconf.sh
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+echo "NOTE: this script is obsolete.  Use autoreconf instead!"
+echo Running libtoolize...
+libtoolize --automake
 echo Running aclocal...
 aclocal
 echo Running autoheader...

diff --git a/util/.cvsignore b/util/.cvsignore
index ab2dc89f79f414b008691695b1a1f29c1d039bf0..87461c821f6c994aecf7c0d8e57f554065f918a2 100644 (file)
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -1,5 +1,6 @@
 Makefile.in
 Makefile
 .deps
+.libs
 fusermount
 fuse_ioslave