summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-04-22 14:19:45 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-04-24 22:53:58 -0400
commit9df0e16e00338ea267c71a2bf3c314d39e8961be (patch)
tree56bd9da5f66fe259267001c2dc4b27773c6eeecb
parente73446e30576ad6dc734398ad2ca709f2263ad51 (diff)
downloadphosphor-fan-presence-9df0e16e00338ea267c71a2bf3c314d39e8961be.tar.gz
phosphor-fan-presence-9df0e16e00338ea267c71a2bf3c314d39e8961be.zip
build: Move presence to a subdirectory
Change-Id: I33b28922107b9b041de3699e4a6eebd3d05ebdef Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--Makefile.am29
-rw-r--r--configure.ac6
-rw-r--r--control/Makefile.am2
-rw-r--r--presence/Makefile.am25
-rw-r--r--presence/example/fan-detect.yaml (renamed from example/fan-detect.yaml)0
-rw-r--r--presence/fan_detect_defs.hpp (renamed from fan_detect_defs.hpp)0
-rw-r--r--presence/fan_enclosure.cpp (renamed from fan_enclosure.cpp)0
-rw-r--r--presence/fan_enclosure.hpp (renamed from fan_enclosure.hpp)0
-rw-r--r--presence/fan_properties.hpp (renamed from fan_properties.hpp)0
-rwxr-xr-xpresence/gen-fan-detect-defs.py (renamed from gen-fan-detect-defs.py)0
-rw-r--r--presence/sensor_base.hpp (renamed from sensor_base.hpp)0
-rw-r--r--presence/tach_detect.cpp (renamed from tach_detect.cpp)0
-rw-r--r--presence/tach_sensor.cpp (renamed from tach_sensor.cpp)0
-rw-r--r--presence/tach_sensor.hpp (renamed from tach_sensor.hpp)0
14 files changed, 37 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index 6180d1e..c3dee8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,12 @@
AM_DEFAULT_SOURCE_EXT = .cpp
-sbin_PROGRAMS = \
- phosphor-fan-presence-tach
-
-phosphor_fan_presence_tach_SOURCES = \
- fan_enclosure.cpp \
- tach_sensor.cpp \
- tach_detect.cpp \
+noinst_LTLIBRARIES = libfan.la
+libfan_la_LDFLAGS = -static
+libfan_la_LIBADD = \
+ $(SDBUSPLUS_LIBS)
+libfan_la_CXXFLAGS =
+ $(SDBUSPLUS_CFLAGS)
+libfan_la_SOURCES = \
utility.cpp
-nodist_phosphor_fan_presence_tach_SOURCES = \
- fan_detect_defs.cpp
-
-phosphor_fan_presence_tach_LDFLAGS = $(SDBUSPLUS_LIBS) $(PHOSPHOR_LOGGING_LIBS)
-phosphor_fan_presence_tach_CXXFLAGS = \
- $(SDBUSPLUS_CFLAGS) \
- $(PHOSPHOR_LOGGING_CFLAGS)
-
-BUILT_SOURCES = fan_detect_defs.cpp
-CLEANFILES = fan_detect_defs.cpp
-
-fan_detect_defs.cpp: ${srcdir}/gen-fan-detect-defs.py
- $(AM_V_GEN)$(GEN_FAN_DETECT_DEFS) > $@
-SUBDIRS = control \ No newline at end of file
+SUBDIRS = . presence control
diff --git a/configure.ac b/configure.ac
index 2c083ca..c3d5d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,12 +35,12 @@ LT_INIT # Required for systemd linking
AC_ARG_VAR(FAN_DETECT_YAML_FILE,
[The fan presence detection definition file to use])
AS_IF([test "x$FAN_DETECT_YAML_FILE" == "x"],
-[FAN_DETECT_YAML_FILE="${srcdir}/example/fan-detect.yaml"])
+[FAN_DETECT_YAML_FILE="${srcdir}/presence/example/fan-detect.yaml"])
AC_DEFINE_UNQUOTED([FAN_DETECT_YAML_FILE], ["$FAN_DETECT_YAML_FILE"],
[The fan presence detection definition file to use])
# Create configured output
AC_SUBST([GEN_FAN_DETECT_DEFS],
-[$PYTHON ${srcdir}/gen-fan-detect-defs.py -y $FAN_DETECT_YAML_FILE])
-AC_CONFIG_FILES([Makefile control/Makefile])
+[$PYTHON ${srcdir}/presence/gen-fan-detect-defs.py -y $FAN_DETECT_YAML_FILE])
+AC_CONFIG_FILES([Makefile presence/Makefile control/Makefile])
AC_OUTPUT
diff --git a/control/Makefile.am b/control/Makefile.am
index a9b8133..73dea93 100644
--- a/control/Makefile.am
+++ b/control/Makefile.am
@@ -1,5 +1,5 @@
AM_DEFAULT_SOURCE_EXT = .cpp
-AM_CPPFLAGS = -I${top_src_dir}
+AM_CPPFLAGS = -iquote ${top_srcdir}
sbin_PROGRAMS = \
phosphor-fan-control
diff --git a/presence/Makefile.am b/presence/Makefile.am
new file mode 100644
index 0000000..10a7363
--- /dev/null
+++ b/presence/Makefile.am
@@ -0,0 +1,25 @@
+AM_DEFAULT_SOURCE_EXT = .cpp
+AM_CPPFLAGS = -iquote ${top_srcdir}
+
+sbin_PROGRAMS = \
+ phosphor-fan-presence-tach
+
+phosphor_fan_presence_tach_SOURCES = \
+ fan_enclosure.cpp \
+ tach_sensor.cpp \
+ tach_detect.cpp
+nodist_phosphor_fan_presence_tach_SOURCES = \
+ fan_detect_defs.cpp
+
+phosphor_fan_presence_tach_LDADD = \
+ $(top_builddir)/libfan.la \
+ $(SDBUSPLUS_LIBS) \
+ $(PHOSPHOR_LOGGING_LIBS)
+phosphor_fan_presence_tach_CXXFLAGS = \
+ $(SDBUSPLUS_CFLAGS) \
+ $(PHOSPHOR_LOGGING_CFLAGS)
+
+BUILT_SOURCES = fan_detect_defs.cpp
+
+fan_detect_defs.cpp: ${srcdir}/gen-fan-detect-defs.py
+ $(AM_V_GEN)$(GEN_FAN_DETECT_DEFS) > $@
diff --git a/example/fan-detect.yaml b/presence/example/fan-detect.yaml
index 5a9e1bd..5a9e1bd 100644
--- a/example/fan-detect.yaml
+++ b/presence/example/fan-detect.yaml
diff --git a/fan_detect_defs.hpp b/presence/fan_detect_defs.hpp
index 6c49366..6c49366 100644
--- a/fan_detect_defs.hpp
+++ b/presence/fan_detect_defs.hpp
diff --git a/fan_enclosure.cpp b/presence/fan_enclosure.cpp
index 262876e..262876e 100644
--- a/fan_enclosure.cpp
+++ b/presence/fan_enclosure.cpp
diff --git a/fan_enclosure.hpp b/presence/fan_enclosure.hpp
index 8f5cfdf..8f5cfdf 100644
--- a/fan_enclosure.hpp
+++ b/presence/fan_enclosure.hpp
diff --git a/fan_properties.hpp b/presence/fan_properties.hpp
index 296318d..296318d 100644
--- a/fan_properties.hpp
+++ b/presence/fan_properties.hpp
diff --git a/gen-fan-detect-defs.py b/presence/gen-fan-detect-defs.py
index 1bc980a..1bc980a 100755
--- a/gen-fan-detect-defs.py
+++ b/presence/gen-fan-detect-defs.py
diff --git a/sensor_base.hpp b/presence/sensor_base.hpp
index c206e70..c206e70 100644
--- a/sensor_base.hpp
+++ b/presence/sensor_base.hpp
diff --git a/tach_detect.cpp b/presence/tach_detect.cpp
index 2449f82..2449f82 100644
--- a/tach_detect.cpp
+++ b/presence/tach_detect.cpp
diff --git a/tach_sensor.cpp b/presence/tach_sensor.cpp
index c21478b..c21478b 100644
--- a/tach_sensor.cpp
+++ b/presence/tach_sensor.cpp
diff --git a/tach_sensor.hpp b/presence/tach_sensor.hpp
index 90d955b..90d955b 100644
--- a/tach_sensor.hpp
+++ b/presence/tach_sensor.hpp
OpenPOWER on IntegriCloud