At Tue, 5 May 2015 13:13:35 +0800, Liu Yuan wrote: > > From: Liu Yuan <[email protected]> > > This is a preparation patch for creating user statically linked libsheepdog.a. > > Signed-off-by: Liu Yuan <[email protected]> > --- > dog/Makefile.am | 4 ++-- > include/common.h | 2 +- > lib/Makefile.am | 14 +++++++------- > lib/common.c | 2 +- > sheep/Makefile.am | 4 ++-- > sheepfs/Makefile.am | 4 ++-- > shepherd/Makefile.am | 4 ++-- > tests/unit/dog/Makefile.am | 2 +- > tests/unit/sheep/Makefile.am | 2 +- > 9 files changed, 19 insertions(+), 19 deletions(-)
Applied, thanks. Hitoshi > > diff --git a/dog/Makefile.am b/dog/Makefile.am > index 5ff4fc3..1bb1b14 100644 > --- a/dog/Makefile.am > +++ b/dog/Makefile.am > @@ -36,8 +36,8 @@ if BUILD_NFS > dog_SOURCES += nfs.c > endif > > -dog_LDADD = ../lib/libsheepdog.a -lpthread > -dog_DEPENDENCIES = ../lib/libsheepdog.a > +dog_LDADD = ../lib/libsd.a -lpthread > +dog_DEPENDENCIES = ../lib/libsd.a > > noinst_HEADERS = treeview.h dog.h farm/farm.h > > diff --git a/include/common.h b/include/common.h > index 7865146..4bc267a 100644 > --- a/include/common.h > +++ b/include/common.h > @@ -11,7 +11,7 @@ > * along with this program. If not, see <http://www.gnu.org/licenses/>. > */ > > -/* This file contains shared functionalities for libsheepdog.a */ > +/* This file contains shared functionalities for libsd.a */ > > #ifndef __COMMON_H__ > #define __COMMON_H__ > diff --git a/lib/Makefile.am b/lib/Makefile.am > index ecbdac8..975954c 100644 > --- a/lib/Makefile.am > +++ b/lib/Makefile.am > @@ -16,9 +16,9 @@ libsheepdog_la_CPPFLAGS = $(AM_CPPFLAGS) > -DNO_SHEEPDOG_LOGGER > pkginclude_HEADERS = ../include/sheepdog_proto.h shared/sheepdog.h \ > ../include/util.h ../include/list.h > > -libsheepdog_a_DEPENDENCIES = > +libsd_a_DEPENDENCIES = > > -noinst_LIBRARIES = libisa.a libsheepdog.a > +noinst_LIBRARIES = libisa.a libsd.a > > libisa_a_SOURCES = $(shell find isa-l/ -type f -regex > ".*\.\(c\|h\|asm\)") \ > isa-l/erasure_code/Makefile \ > @@ -26,11 +26,11 @@ libisa_a_SOURCES = $(shell find isa-l/ -type f -regex > ".*\.\(c\|h\|asm\)") \ > isa-l/Makefile.nmake \ > isa-l/make.inc > > -libsheepdog_a_SOURCES = event.c logger.c net.c util.c rbtree.c > strbuf.c \ > +libsd_a_SOURCES = event.c logger.c net.c util.c rbtree.c > strbuf.c \ > sha1.c option.c work.c sockfd_cache.c fec.c \ > sd_inode.c common.c > > -libsheepdog_a_LIBADD = isa-l/bin/ec_base.o \ > +libsd_a_LIBADD = isa-l/bin/ec_base.o \ > isa-l/bin/ec_highlevel_func.o \ > isa-l/bin/ec_multibinary.o \ > isa-l/bin/gf_2vect_dot_prod_sse.o \ > @@ -43,7 +43,7 @@ libsheepdog_a_LIBADD = isa-l/bin/ec_base.o \ > isa-l/bin/gf_vect_mul_sse.o > > if BUILD_SHA1_HW > -libsheepdog_a_SOURCES += sha1_ssse3.S > +libsd_a_SOURCES += sha1_ssse3.S > endif > > if BUILD_TRACE > @@ -55,7 +55,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/tracepoint > noinst_HEADERS = tracepoint/work_tp.h > tracepoint/sockfd_cache_tp.h tracepoint/event_tp.h > > if BUILD_LTTNG_UST > -libsheepdog_a_SOURCES += tracepoint/work_tp.c > tracepoint/sockfd_cache_tp.c tracepoint/event_tp.c > +libsd_a_SOURCES += tracepoint/work_tp.c > tracepoint/sockfd_cache_tp.c tracepoint/event_tp.c > endif > > # support for GNU Flymake > @@ -63,7 +63,7 @@ check-syntax: > $(COMPILE) -fsyntax-only $(CHK_SOURCES) > > check-style: > - @$(CHECK_STYLE) $(libsheepdog_a_SOURCES) > + @$(CHECK_STYLE) $(libsd_a_SOURCES) > > libisa.a: > cd isa-l/ && $(MAKE) && cd .. > diff --git a/lib/common.c b/lib/common.c > index 52c6ef4..94415e6 100644 > --- a/lib/common.c > +++ b/lib/common.c > @@ -11,7 +11,7 @@ > * along with this program. If not, see <http://www.gnu.org/licenses/>. > */ > > -/* This file contains shared functionalities for libsheepdog.a */ > +/* This file contains shared functionalities for libsd.a */ > > #include <sys/types.h> > #include <sys/stat.h> > diff --git a/sheep/Makefile.am b/sheep/Makefile.am > index 9dedb03..3a11d8f 100644 > --- a/sheep/Makefile.am > +++ b/sheep/Makefile.am > @@ -55,14 +55,14 @@ AM_CPPFLAGS += -DENABLE_TRACE > sheep_SOURCES += trace/trace.c trace/mcount.S trace/graph.c > trace/checker.c > endif > > -sheep_LDADD = ../lib/libsheepdog.a -lpthread -lm\ > +sheep_LDADD = ../lib/libsd.a -lpthread -lm\ > $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS) > > if BUILD_NFS > sheep_LDADD += -lrt > endif > > -sheep_DEPENDENCIES = ../lib/libsheepdog.a > +sheep_DEPENDENCIES = ../lib/libsd.a > > > noinst_HEADERS = sheep_priv.h cluster.h http/http.h > trace/trace.h > diff --git a/sheepfs/Makefile.am b/sheepfs/Makefile.am > index 6026513..c162e70 100644 > --- a/sheepfs/Makefile.am > +++ b/sheepfs/Makefile.am > @@ -30,13 +30,13 @@ if BUILD_HTTP > sheepfs_SOURCES += http.c > endif > > -sheepfs_LDADD = ../lib/libsheepdog.a $(fuse_LIBS) $(LIBS) > -lpthread > +sheepfs_LDADD = ../lib/libsd.a $(fuse_LIBS) $(LIBS) -lpthread > > if BUILD_HTTP > sheepfs_LDADD += -lcurl > endif > > -sheepfs_DEPENDENCIES = ../lib/libsheepdog.a > +sheepfs_DEPENDENCIES = ../lib/libsd.a > > noinst_HEADERS = sheepfs.h > > diff --git a/shepherd/Makefile.am b/shepherd/Makefile.am > index 86f45be..ca6c80d 100644 > --- a/shepherd/Makefile.am > +++ b/shepherd/Makefile.am > @@ -25,8 +25,8 @@ sbin_PROGRAMS = shepherd > > shepherd_SOURCES = shepherd.c > > -shepherd_LDADD = ../lib/libsheepdog.a -lpthread > -shepherd_DEPENDENCIES = ../lib/libsheepdog.a > +shepherd_LDADD = ../lib/libsd.a -lpthread > +shepherd_DEPENDENCIES = ../lib/libsd.a > > EXTRA_DIST = > > diff --git a/tests/unit/dog/Makefile.am b/tests/unit/dog/Makefile.am > index ed4ed72..ebc607d 100644 > --- a/tests/unit/dog/Makefile.am > +++ b/tests/unit/dog/Makefile.am > @@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include > \ > -I../mock \ > @CHECK_CFLAGS@ > > -LIBS = $(top_srcdir)/lib/libsheepdog.a -lpthread \ > +LIBS = $(top_srcdir)/lib/libsd.a -lpthread \ > ../mock/libmock.a @CHECK_LIBS@ > > test_common_SOURCES = test_common.c mock_dog.c \ > diff --git a/tests/unit/sheep/Makefile.am b/tests/unit/sheep/Makefile.am > index ac3dc8c..cd1b066 100644 > --- a/tests/unit/sheep/Makefile.am > +++ b/tests/unit/sheep/Makefile.am > @@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include > \ > -I../mock \ > @CHECK_CFLAGS@ > > -LIBS = $(top_srcdir)/lib/libsheepdog.a \ > +LIBS = $(top_srcdir)/lib/libsd.a \ > ../mock/libmock.a -lpthread -lm \ > @CHECK_LIBS@ > > -- > 1.9.1 > > -- > sheepdog mailing list > [email protected] > https://lists.wpkg.org/mailman/listinfo/sheepdog -- sheepdog mailing list [email protected] https://lists.wpkg.org/mailman/listinfo/sheepdog
