summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2018-10-29 16:01:06 -0700
committerWilliam A. Kennington III <wak@google.com>2019-02-05 11:55:21 -0800
commitdea024f072cd996136345031ce04ab09838f9726 (patch)
tree782614582cee2f56593a58523abc7a86111e07e4
parent8fd879fb7bb9ed34fe69581dc714b4158046519f (diff)
downloadphosphor-fan-presence-dea024f072cd996136345031ce04ab09838f9726.zip
phosphor-fan-presence-dea024f072cd996136345031ce04ab09838f9726.tar.gz
libfan: Remove
Since the removal of the custom timer implementation our libfan has nothing but a single header file. Since we have no object code left we do not need a library to contain this code since the header is directly included where needed. Tested: Built and run through unit tests. Change-Id: I139b83ab979ead88cfd4c180ba8847a29c6407e2 Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r--Makefile.am14
-rw-r--r--control/Makefile.am1
-rw-r--r--cooling-type/Makefile.am1
-rw-r--r--monitor/Makefile.am1
-rw-r--r--presence/Makefile.am1
-rw-r--r--utility.cpp27
6 files changed, 0 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am
index 5d81f75..c0483fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,5 @@
AM_DEFAULT_SOURCE_EXT = .cpp
-noinst_LTLIBRARIES = libfan.la
-libfan_la_LDFLAGS = -static
-libfan_la_LIBADD = \
- $(PHOSPHOR_DBUS_INTERFACES_LIBS) \
- $(PHOSPHOR_LOGGING_LIBS) \
- $(SDBUSPLUS_LIBS)
-libfan_la_CXXFLAGS = \
- $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
- $(PHOSPHOR_LOGGING_CFLAGS) \
- $(SDBUSPLUS_CFLAGS) \
- -flto
-libfan_la_SOURCES = \
- utility.cpp
-
SUBDIRS = . sdevent/test evdevpp/test
if WANT_PRESENCE
diff --git a/control/Makefile.am b/control/Makefile.am
index e0b0865..b6d335f 100644
--- a/control/Makefile.am
+++ b/control/Makefile.am
@@ -16,7 +16,6 @@ nodist_phosphor_fan_control_SOURCES = \
fan_zone_defs.cpp
phosphor_fan_control_LDADD = \
- $(top_builddir)/libfan.la \
$(SDBUSPLUS_LIBS) \
$(SDEVENTPLUS_LIBS) \
$(PHOSPHOR_LOGGING_LIBS) \
diff --git a/cooling-type/Makefile.am b/cooling-type/Makefile.am
index 68d6c2f..0c3dfa8 100644
--- a/cooling-type/Makefile.am
+++ b/cooling-type/Makefile.am
@@ -17,7 +17,6 @@ phosphor_cooling_type_CXXFLAGS = \
-flto
phosphor_cooling_type_LDADD = \
- ${top_builddir}/libfan.la \
$(SDBUSPLUS_LIBS) \
$(PHOSPHOR_LOGGING_LIBS) \
$(LIBEVDEV_LIBS) \
diff --git a/monitor/Makefile.am b/monitor/Makefile.am
index e8d9bbd..e017de3 100644
--- a/monitor/Makefile.am
+++ b/monitor/Makefile.am
@@ -17,7 +17,6 @@ nodist_phosphor_fan_monitor_SOURCES = \
BUILT_SOURCES = fan_monitor_defs.cpp
phosphor_fan_monitor_LDADD = \
- $(top_builddir)/libfan.la \
$(SDBUSPLUS_LIBS) \
$(SDEVENTPLUS_LIBS) \
$(PHOSPHOR_LOGGING_LIBS) \
diff --git a/presence/Makefile.am b/presence/Makefile.am
index 8fa0259..445ef9e 100644
--- a/presence/Makefile.am
+++ b/presence/Makefile.am
@@ -14,7 +14,6 @@ phosphor_fan_presence_tach_SOURCES = \
tach_detect.cpp
phosphor_fan_presence_tach_LDADD = \
- $(top_builddir)/libfan.la \
$(SDBUSPLUS_LIBS) \
$(SDEVENTPLUS_LIBS) \
$(PHOSPHOR_LOGGING_LIBS) \
diff --git a/utility.cpp b/utility.cpp
deleted file mode 100644
index 08970d3..0000000
--- a/utility.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright © 2017 IBM Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "utility.hpp"
-
-namespace phosphor
-{
-namespace fan
-{
-namespace util
-{
- // Keep for future functions
-}
-}
-}
OpenPOWER on IntegriCloud