Repository: incubator-guacamole-server Updated Branches: refs/heads/master d35cc7a83 -> c49c57ef3
GUACAMOLE-402: fix out-of-tree build Use $(srcdir) in places were it's needed, so that an out-of-tree build works. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/bb527f30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/bb527f30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/bb527f30 Branch: refs/heads/master Commit: bb527f30f8967939659bb12a7a37861a7e4fb450 Parents: d35cc7a Author: David Fort <[email protected]> Authored: Thu Oct 12 15:11:27 2017 +0200 Committer: David Fort <[email protected]> Committed: Thu Oct 12 15:11:27 2017 +0200 ---------------------------------------------------------------------- src/libguac/Makefile.am | 2 +- src/protocols/rdp/Makefile.am | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/bb527f30/src/libguac/Makefile.am ---------------------------------------------------------------------- diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index 0d30f63..a76c0f3 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -115,7 +115,7 @@ libguacinc_HEADERS += guacamole/socket-wsa.h endif libguac_la_CFLAGS = \ - -Werror -Wall -pedantic -Iguacamole + -Werror -Wall -pedantic -I$(srcdir)/guacamole libguac_la_LDFLAGS = \ -version-info 14:0:2 \ http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/bb527f30/src/protocols/rdp/Makefile.am ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 2a2ebca..10efb17 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -247,18 +247,18 @@ CLEANFILES = _generated_keymaps.c BUILT_SOURCES = _generated_keymaps.c rdp_keymaps = \ - keymaps/base.keymap \ - keymaps/failsafe.keymap \ - keymaps/de_de_qwertz.keymap \ - keymaps/en_us_qwerty.keymap \ - keymaps/fr_fr_azerty.keymap \ - keymaps/fr_ch_qwertz.keymap \ - keymaps/it_it_qwerty.keymap \ - keymaps/ja_jp_qwerty.keymap \ - keymaps/sv_se_qwerty.keymap + $(srcdir)/keymaps/base.keymap \ + $(srcdir)/keymaps/failsafe.keymap \ + $(srcdir)/keymaps/de_de_qwertz.keymap \ + $(srcdir)/keymaps/en_us_qwerty.keymap \ + $(srcdir)/keymaps/fr_fr_azerty.keymap \ + $(srcdir)/keymaps/fr_ch_qwertz.keymap \ + $(srcdir)/keymaps/it_it_qwerty.keymap \ + $(srcdir)/keymaps/ja_jp_qwerty.keymap \ + $(srcdir)/keymaps/sv_se_qwerty.keymap _generated_keymaps.c: $(rdp_keymaps) - keymaps/generate.pl $(rdp_keymaps) + $(srcdir)/keymaps/generate.pl $(rdp_keymaps) EXTRA_DIST = \ $(rdp_keymaps) \
