diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-07-18 21:51:12 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-07-18 22:29:11 -0500 |
| commit | 817248ca5013b2ae750f777cb989d651e024d4b8 (patch) | |
| tree | c2520b45f13294ba7e8372bfd925413170256821 | |
| parent | 2b0bdd6ee040cc3aa7980c95955fe3b79bfabd42 (diff) | |
| download | sdbusplus-817248ca5013b2ae750f777cb989d651e024d4b8.tar.gz sdbusplus-817248ca5013b2ae750f777cb989d651e024d4b8.zip | |
build: fix out of tree build in example
The following problems existed:
* The sdbus++ output directory would not exist so invoke mkdir.
* The directory for the example schema is not in . but in $(srcdir),
so use -r directive to sdbus++ to set schema root accordingly.
* The mako template files generated into the build tree, so pass
sdbus++ the template path relative to $(top_builddir).
Change-Id: I76f70ed832c7cf0ce2a7b8a8ec21672ebcea9c02
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
| -rw-r--r-- | example/Makefile.am | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/example/Makefile.am b/example/Makefile.am index ae5cdcb..2cf8941 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -11,11 +11,11 @@ calculator_markdown_generated_files = \ calculator_server_SOURCES = \ calculator-server.cpp $(calculator_server_generated_files) -calculator_server_CXXFLAGS = $(SYSTEMD_CFLAGS) +calculator_server_CXXFLAGS = $(SYSTEMD_CFLAGS) -I$(top_srcdir) calculator_server_LDADD = $(SYSTEMD_LIBS) ../libsdbusplus.la list_users_SOURCES = list-users.cpp -list_users_CXXFLAGS = $(SYSTEMD_CFLAGS) +list_users_CXXFLAGS = $(SYSTEMD_CFLAGS) -I$(top_srcdir) list_users_LDADD = $(SYSTEMD_LIBS) ../libsdbusplus.la BUILT_SOURCES = \ @@ -26,23 +26,34 @@ CLEANFILES = \ $(calculator_markdown_generated_files) net/poettering/Calculator/server.hpp: + @mkdir -p $(@D) @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ interface server-header net.poettering.Calculator > $@ net/poettering/Calculator/server.cpp: + @mkdir -p $(@D) @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ interface server-cpp net.poettering.Calculator > $@ net/poettering/Calculator/error.hpp: + @mkdir -p $(@D) @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ error exception-header net.poettering.Calculator > $@ net/poettering/Calculator/error.cpp: + @mkdir -p $(@D) @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ error exception-cpp net.poettering.Calculator > $@ calculator.md: + @mkdir -p $(@D) @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ interface markdown net.poettering.Calculator > $@ @top_srcdir@/tools/sdbus++ \ + -r $(srcdir) -t $(top_builddir)/tools/sdbusplus/templates \ error markdown net.poettering.Calculator >> $@ |
