maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-402: Merge fix out-of-tree build

Browse Source
This commit is contained in:
Nick Couchman 2017-10-12 12:35:46 -04:00
commit c49c57ef30
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libguac/Makefile.am
View File

@ -115,7 +115,7 @@ libguacinc_HEADERS += guacamole/socket-wsa.h
endif endif
libguac_la_CFLAGS = \ libguac_la_CFLAGS = \
-Werror -Wall -pedantic -Iguacamole -Werror -Wall -pedantic -I$(srcdir)/guacamole
libguac_la_LDFLAGS = \ libguac_la_LDFLAGS = \
-version-info 14:0:2 \ -version-info 14:0:2 \

20
src/protocols/rdp/Makefile.am
View File

@ -247,18 +247,18 @@ CLEANFILES = _generated_keymaps.c
BUILT_SOURCES = _generated_keymaps.c BUILT_SOURCES = _generated_keymaps.c
rdp_keymaps = \ rdp_keymaps = \
keymaps/base.keymap \ $(srcdir)/keymaps/base.keymap \
keymaps/failsafe.keymap \ $(srcdir)/keymaps/failsafe.keymap \
keymaps/de_de_qwertz.keymap \ $(srcdir)/keymaps/de_de_qwertz.keymap \
keymaps/en_us_qwerty.keymap \ $(srcdir)/keymaps/en_us_qwerty.keymap \
keymaps/fr_fr_azerty.keymap \ $(srcdir)/keymaps/fr_fr_azerty.keymap \
keymaps/fr_ch_qwertz.keymap \ $(srcdir)/keymaps/fr_ch_qwertz.keymap \
keymaps/it_it_qwerty.keymap \ $(srcdir)/keymaps/it_it_qwerty.keymap \
keymaps/ja_jp_qwerty.keymap \ $(srcdir)/keymaps/ja_jp_qwerty.keymap \
keymaps/sv_se_qwerty.keymap $(srcdir)/keymaps/sv_se_qwerty.keymap
_generated_keymaps.c: $(rdp_keymaps) _generated_keymaps.c: $(rdp_keymaps)
keymaps/generate.pl $(rdp_keymaps) $(srcdir)/keymaps/generate.pl $(rdp_keymaps)
EXTRA_DIST = \ EXTRA_DIST = \
$(rdp_keymaps) \ $(rdp_keymaps) \