[checkmk-commits] Make automake more happy by using standard names.

Module: check_mk Branch: master Commit: b98a105455f96d4a38293e2ab850f7acff27632d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98a105455f96d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 1 16:14:30 2017 +0100 Make automake more happy by using standard names. Change-Id: If7167fe849514e4f3a266173e7a5f9194ec02578 --- livestatus/src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index d07e789..2a835dd 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -28,9 +28,9 @@ unixcat_SOURCES = unixcat.cc unixcat_LDADD = -lpthread unixcat_LDFLAGS = -static-libstdc++ -pkglib_LIBRARIES = livestatus.so +pkglib_LIBRARIES = liblivestatus.a -livestatus_so_SOURCES = \ +liblivestatus_a_SOURCES = \ AndingFilter.cc \ AttributeListAsIntColumn.cc \ AttributeListColumn.cc \ @@ -158,14 +158,14 @@ livestatus_so_SOURCES = \ strutil.cc \ waittriggers.cc -livestatus_so_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ -livestatus_so_CXXFLAGS = -fPIC +liblivestatus_a_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ +liblivestatus_a_CXXFLAGS = -fPIC -livestatus.o: $(livestatus_so_OBJECTS) +livestatus.o: $(liblivestatus_a_OBJECTS) # Note: libstdc++fs is only available as a static library, so we are lucky $(CXX) $(LDFLAGS) -s -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ # To make sure we can dlopen() our NEB later - $(CXX) $(livestatus_so_CXXFLAGS) $(CXXFLAGS) NagiosMockup.cc $@ -o NagiosMockup + $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.cc $@ -o NagiosMockup $(RM) NagiosMockup all-local: livestatus.o @@ -173,7 +173,7 @@ all-local: livestatus.o install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) - rm -f $(DESTDIR)$(pkglibdir)/livestatus.so + rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a clean-local: rm -f *~