Commit 81fac6a4 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2071] Add b10 prefix to libutil_io.la (and s/_/-/)

parent f706565e
......@@ -63,7 +63,7 @@ EXTRA_DIST += auth_messages.mes
b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
b10_auth_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
b10_auth_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
......
......@@ -15,5 +15,5 @@ CLEANFILES = *.gcno *.gcda
pkglibexec_PROGRAMS = b10-sockcreator
b10_sockcreator_SOURCES = sockcreator.cc sockcreator.h main.cc
b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libutil_io.la
b10_sockcreator_LDADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
b10_sockcreator_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
......@@ -22,7 +22,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
endif
noinst_PROGRAMS = $(TESTS)
......@@ -24,7 +24,7 @@ socketsession_la_CXXFLAGS = $(AM_CXXFLAGS) $(PYTHON_CXXFLAGS)
# Python prefers .so, while some OSes (specifically MacOS) use a different
# suffix for dynamic objects. -module is necessary to work this around.
socketsession_la_LDFLAGS += -module -avoid-version
socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libutil_io.la
socketsession_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
socketsession_la_LIBADD += $(PYTHON_LIB)
# This is not installed, it helps locate the module during tests
......
......@@ -31,7 +31,7 @@ libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/config/libb10-cfgclien
libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/log/libb10-log.la
libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/acl/libb10-acl.la
libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la
libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
BUILT_SOURCES = server_common_messages.h server_common_messages.cc
server_common_messages.h server_common_messages.cc: server_common_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/server_common/server_common_messages.mes
......
......@@ -3,11 +3,11 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
lib_LTLIBRARIES = libutil_io.la
libutil_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
libutil_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
libutil_io_la_SOURCES += pktinfo_utilities.h
libutil_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
lib_LTLIBRARIES = libb10-util-io.la
libb10_util_io_la_SOURCES = fd.h fd.cc fd_share.h fd_share.cc
libb10_util_io_la_SOURCES += socketsession.h socketsession.cc sockaddr_util.h
libb10_util_io_la_SOURCES += pktinfo_utilities.h
libb10_util_io_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
......@@ -16,7 +16,7 @@ pyexec_LTLIBRARIES = libutil_io_python.la
# suffix for dynamic objects. -module is necessary to work this around.
libutil_io_python_la_LDFLAGS = -module -avoid-version
libutil_io_python_la_SOURCES = fdshare_python.cc
libutil_io_python_la_LIBADD = libutil_io.la
libutil_io_python_la_LIBADD = libb10-util-io.la
libutil_io_python_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
# Note: PYTHON_CXXFLAGS may have some -Wno... workaround, which must be
# placed after -Wextra defined in AM_CXXFLAGS
......
......@@ -46,7 +46,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(top_builddir)/src/lib/util/libb10-util.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
run_unittests_LDADD += \
$(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
......
......@@ -21,7 +21,7 @@ libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
endif
libutil_unittests_la_LIBADD = $(top_builddir)/src/lib/util/libb10-util.la
libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la
libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
......@@ -14,4 +14,4 @@ CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libb10-xfr.la
libb10_xfr_la_SOURCES = xfrout_client.h xfrout_client.cc
libb10_xfr_la_LIBADD = $(top_builddir)/src/lib/util/io/libutil_io.la
libb10_xfr_la_LIBADD = $(top_builddir)/src/lib/util/io/libb10-util-io.la
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment