diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-09-02 17:52:59 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-09-02 21:22:17 -0500 |
| commit | 686df74e15a610de6a4b20a260704ab4ff00dc50 (patch) | |
| tree | 78a8bd8dcf64548e436431dc6b4ef8a136b82267 /Makefile.am | |
| parent | 3cff7ed7a9e397de35809f787deabcc8a6b3350d (diff) | |
| download | phosphor-host-ipmid-686df74e15a610de6a4b20a260704ab4ff00dc50.tar.gz phosphor-host-ipmid-686df74e15a610de6a4b20a260704ab4ff00dc50.zip | |
Minor reorder and simplification of autotools files
Change-Id: I55db0cf7f6041890564f557c98286c8b4bde80cb
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index cbdfa04..d90cd38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,7 @@ AM_DEFAULT_SOURCE_EXT = .cpp -testit_SOURCES = \ - ipmisensor.cpp \ - testit.cpp -testit_LDFLAGS = $(SYSTEMD_LIBS) $(LIBADD_DLOPEN) - -#testaddsel_SOURCES = \ -# testaddsel.cpp \ -# storageaddsel.cpp -#testaddsel_LDFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_LIBS) $(LIBADD_DLOPEN) +sbin_PROGRAMS = \ + ipmid ipmid_SOURCES = \ ipmid.cpp @@ -16,12 +9,17 @@ ipmid_SOURCES = \ nodist_ipmid_SOURCES = ipmiwhitelist.cpp BUILT_SOURCES = ipmiwhitelist.cpp CLEANFILES = ipmiwhitelist.cpp -WHITELIST_CONF ?= ${srcdir}/host-ipmid-whitelist.conf -ipmiwhitelist.cpp: ${srcdir}/generate_whitelist.sh $(WHITELIST_CONF) - ${srcdir}/$^ > $@ + #TODO - Make this path a configure option (bitbake parameter) ipmid_CPPFLAGS = -DHOST_IPMI_LIB_PATH=\"/usr/lib/host-ipmid/\" ipmid_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(LIBADD_DLOPEN) -export-dynamic +# TODO: Rather than use -export-dynamic, we should use -export-symbol to have a +# selective list of symbols. + +WHITELIST_CONF ?= ${srcdir}/host-ipmid-whitelist.conf +ipmiwhitelist.cpp: ${srcdir}/generate_whitelist.sh $(WHITELIST_CONF) + ${srcdir}/$^ > $@ + libapphandlerdir = /usr/lib/host-ipmid libapphandler_LTLIBRARIES = libapphandler.la @@ -46,16 +44,22 @@ libhostservice_la_SOURCES = \ libhostservice_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) -version-info 0:0:0 -shared libhostservice_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) -libdir = /usr/lib/host-ipmid includedir = /usr/include/host-ipmid include_HEADERS = \ ipmid-api.h -#default sbin dir -sbin_PROGRAMS = \ - ipmid - check_PROGRAMS = \ testit # testaddsel + +testit_SOURCES = \ + ipmisensor.cpp \ + testit.cpp +testit_LDFLAGS = $(SYSTEMD_LIBS) $(LIBADD_DLOPEN) + +#testaddsel_SOURCES = \ +# testaddsel.cpp \ +# storageaddsel.cpp +#testaddsel_LDFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_LIBS) $(LIBADD_DLOPEN) + |
