You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/10/12 16:37:49 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-402: fix
out-of-tree build
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 <co...@hardening-consulting.com>
Authored: Thu Oct 12 15:11:27 2017 +0200
Committer: David Fort <co...@hardening-consulting.com>
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) \
[2/2] incubator-guacamole-server git commit: GUACAMOLE-402: Merge fix
out-of-tree build
Posted by vn...@apache.org.
GUACAMOLE-402: Merge fix out-of-tree build
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/c49c57ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/c49c57ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/c49c57ef
Branch: refs/heads/master
Commit: c49c57ef30b2a4fd20be71006204e75071f7572f
Parents: d35cc7a bb527f3
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Oct 12 12:35:46 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Oct 12 12:35:46 2017 -0400
----------------------------------------------------------------------
src/libguac/Makefile.am | 2 +-
src/protocols/rdp/Makefile.am | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------