diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-06-03 13:21:08 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-06-03 13:21:08 +0000 |
| commit | 203afbfa512490c58f7b98eec417ec3054f0d007 (patch) | |
| tree | 87a6fde0f03bb6f1f1387091be7e27e47ea8a007 | |
| parent | 3a11e5c68d1e4cf5e2bc6c1e1853cb44fa82f89a (diff) | |
| download | libfuse-203afbfa512490c58f7b98eec417ec3054f0d007.tar.gz | |
build shared library
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | example/.cvsignore | 1 | ||||
| -rw-r--r-- | example/Makefile.am | 2 | ||||
| -rw-r--r-- | include/fuse.h | 2 | ||||
| -rw-r--r-- | lib/.cvsignore | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rwxr-xr-x | makeconf.sh | 3 | ||||
| -rw-r--r-- | util/.cvsignore | 1 |
10 files changed, 24 insertions, 5 deletions
@@ -9,3 +9,4 @@ config.log *.cache config.status depcomp +libtool @@ -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 c6744bd..c9b2518 100644 --- 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 e4188bc..f9c7884 100644 --- 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 a3880fa..475cabf 100644 --- 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 3babaf6..e3e4333 100644 --- 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 e440faf..dc4caac 100644 --- 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 04d7039..64385be 100644 --- 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 8cd29ad..ab11b9b 100755 --- 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 ab2dc89..87461c8 100644 --- a/util/.cvsignore +++ b/util/.cvsignore @@ -1,5 +1,6 @@ Makefile.in Makefile .deps +.libs fusermount fuse_ioslave |