control: Remove use of static lib JSON objects
The upcoming inclusion of self registering actions does not function
from within a static library and must be included directly to the
phosphor-fan-control SOURCES. This would be the eventual setup as JSON
based configurations will be the only supported config method which all
JSON objects would be replacing the current objects (i.e. fans, zones,
events, etc..).
Tested:
No change in parsing/loading currently supported config files
Change-Id: I008cd410ef23b6fc3b2076c913252c10588f5488
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/configure.ac b/configure.ac
index d330f54..d0e8b50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@
-e $ZONE_EVENTS_YAML_FILE \
-c $ZONE_CONDITIONS_YAML_FILE"])
])
- AC_CONFIG_FILES([control/json/Makefile control/Makefile])
+ AC_CONFIG_FILES([control/Makefile])
])
AS_IF([test "x$enable_cooling_type" != "xno"], [
diff --git a/control/Makefile.am b/control/Makefile.am
index 27a5c83..f8f561b 100644
--- a/control/Makefile.am
+++ b/control/Makefile.am
@@ -1,5 +1,5 @@
AM_DEFAULT_SOURCE_EXT = .cpp
-AM_CPPFLAGS = -iquote ${top_srcdir}
+AM_CPPFLAGS = -iquote ${top_srcdir} -I${srcdir}/json -I${srcdir}/json/actions
bin_PROGRAMS = \
phosphor-fan-control
@@ -31,9 +31,14 @@
-flto
if WANT_JSON_CONTROL
-SUBDIRS = json .
-phosphor_fan_control_LDADD += ${builddir}/json/libfan-control-json.la
-phosphor_fan_control_SOURCES += json_parser.cpp
+phosphor_fan_control_SOURCES += \
+ json_parser.cpp \
+ json/manager.cpp \
+ json/profile.cpp \
+ json/fan.cpp \
+ json/zone.cpp \
+ json/group.cpp \
+ json/event.cpp
else
BUILT_SOURCES = fan_zone_defs.cpp
nodist_phosphor_fan_control_SOURCES = \
diff --git a/control/json/Makefile.am b/control/json/Makefile.am
deleted file mode 100644
index bc1db07..0000000
--- a/control/json/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_DEFAULT_SOURCE_EXT = .cpp
-AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/control
-
-noinst_LTLIBRARIES = libfan-control-json.la
-libfan_control_json_la_LDFLAGS = -static
-libfan_control_json_la_LIBADD = \
- $(SDBUSPLUS_LIBS) \
- $(PHOSPHOR_LOGGING_LIBS)
-
-libfan_control_json_la_CXXFLAGS = \
- $(SDBUSPLUS_CFLAGS) \
- $(PHOSPHOR_LOGGING_CFLAGS)
-
-libfan_control_json_la_SOURCES = \
- manager.cpp \
- profile.cpp \
- fan.cpp \
- zone.cpp \
- group.cpp \
- event.cpp