Move to new association interface
A new association interface is defined in phosphor-dbus-interfaces
It would be nice to move the local version of the interface
to the new one.
The behavior of how association work is described here:
https://github.com/openbmc/docs/blob/master/object-mapper.md#associations
Partially resolves openbmc/openbmc#3584
Tested: See the org.openbmc.Associations interface has been replaced by the xyz
one in /xyz/openbmc_project/software/version_id object
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I249b7fea26f720b57e60e0bf8ba8bc71c620af98
diff --git a/Makefile.am b/Makefile.am
index 6c3ec16..9b4e251 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,9 +29,7 @@
BUILT_SOURCES = \
xyz/openbmc_project/Software/Image/error.cpp \
- xyz/openbmc_project/Software/Image/error.hpp \
- org/openbmc/Associations/server.cpp \
- org/openbmc/Associations/server.hpp
+ xyz/openbmc_project/Software/Image/error.hpp
CLEANFILES = ${BUILT_SOURCES}
@@ -90,9 +88,6 @@
synclist
endif
-nodist_phosphor_image_updater_SOURCES = \
- org/openbmc/Associations/server.cpp
-
generic_cxxflags = \
$(SYSTEMD_CFLAGS) \
$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
@@ -116,14 +111,6 @@
@mkdir -p `dirname $@`
$(SDBUSPLUSPLUS) -r $(srcdir) error exception-cpp xyz.openbmc_project.Software.Image > $@
-org/openbmc/Associations/server.cpp: org/openbmc/Associations.interface.yaml
- @mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) interface server-cpp org.openbmc.Associations > $@
-
-org/openbmc/Associations/server.hpp: org/openbmc/Associations.interface.yaml
- @mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) interface server-header org.openbmc.Associations > $@
-
phosphor_version_software_manager_CXXFLAGS = $(generic_cxxflags)
phosphor_version_software_manager_LDFLAGS = $(generic_ldflags)
phosphor_download_manager_CXXFLAGS = $(generic_cxxflags)