move dynamic_annotations.cc under libsysinfo.la
See github issue #1474 for immediate reason.
Note, this entire idea of number of convenience libraries is likely
simply artifact of Google's codebase past. We don't really need this
complexity. But I am holding big reorganization of this for after API
and ABI work. For now, simply moving dynamic_annotations.cc into
libsysinfo fixes things. Most of the code links both anyways. So lets
just do it.
diff --git a/Makefile.am b/Makefile.am
index 143d569..e9ca271 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,7 +158,6 @@
src/base/dynamic_annotations.h
noinst_LTLIBRARIES += liblogging.la
liblogging_la_SOURCES = src/base/logging.cc \
- src/base/dynamic_annotations.cc \
$(LOGGING_INCLUDES)
SYSINFO_INCLUDES = src/base/sysinfo.h \
@@ -168,6 +167,7 @@
src/base/basictypes.h
noinst_LTLIBRARIES += libsysinfo.la
libsysinfo_la_SOURCES = src/base/sysinfo.cc \
+ src/base/dynamic_annotations.cc \
$(SYSINFO_INCLUDES)
libsysinfo_la_LIBADD = $(NANOSLEEP_LIBS)