lgcosta/reiserfsprogs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: introduce shared libreiserfscore.so and export it

Browse Source 
In order to use reiserfs functionality in external programs, we need to
make a shared library and includes available.

This converts both libmisc and libreiserfscore into shared libraries, and
links libmisc into libreiserfscore. We also export the includes and
a pkg-config file.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
This commit is contained in:
Jeff Mahoney committed 2013-08-26 19:02:20 -04:00
1 parent 97fa944851
commit 19566d0878
10 files changed
+32 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configure.ac
+2 -1
View File
@@ -20,7 +20,7 @@ AC_PROG_AWK
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_RANLIB AC_PROG_LIBTOOL
dnl Checks for libraries. dnl Checks for libraries.
@@ -131,6 +131,7 @@ AC_OUTPUT(
lib/Makefile lib/Makefile
Makefile Makefile
reiserfscore/Makefile reiserfscore/Makefile
reiserfscore/reiserfscore.pc
debugreiserfs/Makefile debugreiserfs/Makefile
debugreiserfs/debugreiserfs.8 debugreiserfs/debugreiserfs.8
tune/Makefile tune/Makefile
debugreiserfs/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ debugreiserfs_SOURCES = debugreiserfs.c pack.c unpack.c stat.c corruption.c scan
man_MANS = debugreiserfs.8 man_MANS = debugreiserfs.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a LDADD = $(top_builddir)/reiserfscore/libreiserfscore.la
install-exec-hook: install-exec-hook:
$(LN_S) debugreiserfs $(DESTDIR)$(sbindir)/debugfs.reiserfs $(LN_S) debugreiserfs $(DESTDIR)$(sbindir)/debugfs.reiserfs
fsck/Makefile.am
+4 -3
View File
@@ -1,13 +1,14 @@
sbin_PROGRAMS = reiserfsck sbin_PROGRAMS = reiserfsck
reiserfsck_SOURCES = main.c pass0.c pass1.c pass2.c semantic_check.c \ reiserfsck_SOURCES = main.c pass0.c pass1.c pass2.c semantic_check.c \
semantic_rebuild.c pass4.c lost+found.c ubitmap.c uobjectid.c ustree.c \ semantic_rebuild.c pass4.c lost+found.c ubitmap.c \
ufile.c check_tree.c info.c super.c fsck.h uobjectid.c ustree.c ufile.c check_tree.c info.c \
super.c fsck.h
man_MANS = reiserfsck.8 man_MANS = reiserfsck.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
reiserfsck_LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a reiserfsck_LDADD = $(top_builddir)/reiserfscore/libreiserfscore.la
install-exec-hook: install-exec-hook:
$(LN_S) reiserfsck $(DESTDIR)$(sbindir)/fsck.reiserfs $(LN_S) reiserfsck $(DESTDIR)$(sbindir)/fsck.reiserfs
include/Makefile.am
+3 -1
View File
@@ -1 +1,3 @@
noinst_HEADERS = io.h misc.h reiserfs_fs.h reiserfs_lib.h swab.h parse_time.h progbar.h noinst_HEADERS = parse_time.h progbar.h
reiserfsdir = $(includedir)/reiserfs
reiserfs_HEADERS = io.h misc.h reiserfs_fs.h reiserfs_lib.h swab.h
lib/Makefile.am
+2 -2
View File
@@ -1,5 +1,5 @@
noinst_LIBRARIES = libmisc.a noinst_LTLIBRARIES = libmisc.la
libmisc_a_SOURCES = io.c misc.c parse_time.c progbar.c libmisc_la_SOURCES = io.c misc.c parse_time.c progbar.c
##reiserfs.c ##reiserfs.c
mkreiserfs/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ mkreiserfs_SOURCES = mkreiserfs.c
man_MANS = mkreiserfs.8 man_MANS = mkreiserfs.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a LDADD = $(top_builddir)/reiserfscore/libreiserfscore.la
install-exec-hook: install-exec-hook:
$(LN_S) mkreiserfs $(DESTDIR)$(sbindir)/mkfs.reiserfs $(LN_S) mkreiserfs $(DESTDIR)$(sbindir)/mkfs.reiserfs
reiserfscore/Makefile.am
+7 -3
View File
@@ -1,5 +1,9 @@
noinst_LIBRARIES = libcore.a lib_LTLIBRARIES = libreiserfscore.la
libcore_a_SOURCES = do_balan.c fix_node.c hashes.c ibalance.c lbalance.c prints.c \ libreiserfscore_la_SOURCES = do_balan.c fix_node.c hashes.c ibalance.c \
stree.c node_formats.c reiserfslib.c bitmap.c journal.c includes.h lbalance.c prints.c stree.c node_formats.c \
reiserfslib.c bitmap.c journal.c includes.h
libreiserfscore_la_LIBADD = ../lib/libmisc.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = reiserfscore.pc
reiserfscore/reiserfscore.pc.in
+10
View File
@@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: reiserfscore
Description: ReiserFS Core Library
Version: @REISERFSPROGS_VERSION@
Cflags: -I${includedir}/reiserfs -I${includedir}
Libs: -L${libdir} -lreiserfscore
resize_reiserfs/Makefile.am
+1 -1
View File
@@ -4,5 +4,5 @@ resize_reiserfs_SOURCES = fe.c resize_reiserfs.c do_shrink.c resize.h
man_MANS = resize_reiserfs.8 man_MANS = resize_reiserfs.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a LDADD = $(top_builddir)/reiserfscore/libreiserfscore.la
tune/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@ reiserfstune_SOURCES = tune.c tune.h
man_MANS = reiserfstune.8 man_MANS = reiserfstune.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a LDADD = $(top_builddir)/reiserfscore/libreiserfscore.la
install-exec-hook: install-exec-hook:
$(LN_S) reiserfstune $(DESTDIR)$(sbindir)/tunefs.reiserfs $(LN_S) reiserfstune $(DESTDIR)$(sbindir)/tunefs.reiserfs