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

Substitute values properly, fix linking flags.

Browse Source
This commit is contained in:
Michael Jumper 2013-06-11 22:41:23 -07:00
parent 760506da3d
commit 602e0045b6
7 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -93,6 +93,8 @@ AC_CHECK_HEADER(vorbis/vorbisenc.h,, [have_vorbisenc=no])
AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbisenc"], [have_vorbisenc=no]) AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbisenc"], [have_vorbisenc=no])
AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"]) AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"])
AC_SUBST(VORBIS_LIBS)
# #
# libVNCServer # libVNCServer
# #
@ -103,6 +105,8 @@ VNC_LIBS=
AC_CHECK_LIB([vncclient], [rfbInitClient], [VNC_LIBS="$VNC_LIBS -lvncclient"], [have_libvncserver=no]) AC_CHECK_LIB([vncclient], [rfbInitClient], [VNC_LIBS="$VNC_LIBS -lvncclient"], [have_libvncserver=no])
AM_CONDITIONAL([ENABLE_VNC], [test "x${have_libvncserver}" = "xyes"]) AM_CONDITIONAL([ENABLE_VNC], [test "x${have_libvncserver}" = "xyes"])
AC_SUBST(VNC_LIBS)
# #
# FreeRDP # FreeRDP
# #
@ -117,6 +121,8 @@ AC_CHECK_LIB([freerdp-utils], [xzalloc], [RDP_LIBS="$RDP_LIBS -lfreerdp-utils
AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"], [have_freerdp=no]) AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"], [have_freerdp=no])
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"]) AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
AC_SUBST(RDP_LIBS)
# #
# libssh # libssh
# #
@ -129,6 +135,8 @@ PKG_CHECK_MODULES([PANGO], pango);
PKG_CHECK_MODULES([PANGOCAIRO], pangocairo); PKG_CHECK_MODULES([PANGOCAIRO], pangocairo);
AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes"]) AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes"])
AC_SUBST(SSH_LIBS)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
tests/Makefile tests/Makefile
src/libguac/Makefile src/libguac/Makefile

4
src/guacd/Makefile.am
View File

@ -37,7 +37,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
initdir = @init_dir@ initdir = @init_dir@
AM_CFLAGS = -Werror -Wall -pedantic $(LIBGUAC_INCLUDE) AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@
sbin_PROGRAMS = guacd sbin_PROGRAMS = guacd
init_SCRIPTS = init.d/guacd init_SCRIPTS = init.d/guacd
@ -45,7 +45,7 @@ man_MANS = man/guacd.8
noinst_HEADERS = client.h log.h noinst_HEADERS = client.h log.h
guacd_SOURCES = daemon.c client.c log.c guacd_SOURCES = daemon.c client.c log.c
guacd_LDADD = $(LIBGUAC_LTLIB) guacd_LDADD = @LIBGUAC_LTLIB@
EXTRA_DIST = init.d/guacd.in man/guacd.8 EXTRA_DIST = init.d/guacd.in man/guacd.8
CLEANFILES = $(init_SCRIPTS) CLEANFILES = $(init_SCRIPTS)

3
src/libguac/Makefile.am
View File

@ -37,7 +37,6 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole
AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
libguacincdir = $(includedir)/guacamole libguacincdir = $(includedir)/guacamole
libguacinc_HEADERS = \ libguacinc_HEADERS = \
@ -75,5 +74,5 @@ libguac_la_SOURCES = \
unicode.c unicode.c
lib_LTLIBRARIES = libguac.la lib_LTLIBRARIES = libguac.la
libguac_la_LDFLAGS = -version-info 4:0:0 libguac_la_LDFLAGS = -version-info 4:0:0 @PTHREAD_LIBS@

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

@ -37,8 +37,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -Iinclude $(LIBGUAC_INCLUDE) AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@
AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
lib_LTLIBRARIES = libguac-client-rdp.la lib_LTLIBRARIES = libguac-client-rdp.la
freerdp_LTLIBRARIES = guac_rdpsnd.la freerdp_LTLIBRARIES = guac_rdpsnd.la
@ -88,11 +87,11 @@ if ENABLE_OGG
noinst_HEADERS += ogg_encoder.h noinst_HEADERS += ogg_encoder.h
endif endif
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@
guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@
libguac_client_rdp_la_LIBADD = $(LIBGUAC_LTLIB) libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@
guac_rdpsnd_la_LIBADD = $(LIBGUAC_LTLIB) guac_rdpsnd_la_LIBADD = @LIBGUAC_LTLIB@
freerdpdir = ${libdir}/freerdp freerdpdir = ${libdir}/freerdp

7
src/protocols/ssh/Makefile.am
View File

@ -37,7 +37,6 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_LDFLAGS = $(SSH_LIBS) $(PTHREAD_LIBS)
lib_LTLIBRARIES = libguac-client-ssh.la lib_LTLIBRARIES = libguac-client-ssh.la
@ -71,7 +70,7 @@ noinst_HEADERS = \
terminal_handlers.h \ terminal_handlers.h \
types.h types.h
libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ $(LIBGUAC_INCLUDE) libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ @LIBGUAC_INCLUDE@
libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ $(LIBGUAC_LTLIB) libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ @LIBGUAC_LTLIB@
libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 @SSH_LIBS@ @PTHREAD_LIBS@

7
src/protocols/vnc/Makefile.am
View File

@ -37,14 +37,13 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE) AM_CFLAGS = -Werror -Wall -pedantic -Iinclude @LIBGUAC_INCLUDE@
AM_LDFLAGS = $(VNC_LIBS)
lib_LTLIBRARIES = libguac-client-vnc.la lib_LTLIBRARIES = libguac-client-vnc.la
libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c
noinst_HEADERS = client.h vnc_handlers.h guac_handlers.h convert.h noinst_HEADERS = client.h vnc_handlers.h guac_handlers.h convert.h
libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0 libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0 @VNC_LIBS@
libguac_client_vnc_la_LIBADD = $(LIBGUAC_LTLIB) libguac_client_vnc_la_LIBADD = @LIBGUAC_LTLIB@

4
tests/Makefile.am
View File

@ -36,7 +36,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -pedantic $(LIBGUAC_INCLUDE) AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@
TESTS = test_libguac TESTS = test_libguac
check_PROGRAMS = test_libguac check_PROGRAMS = test_libguac
@ -58,5 +58,5 @@ test_libguac_SOURCES = \
util/util_suite.c \ util/util_suite.c \
util/guac_pool.c util/guac_pool.c
test_libguac_LDADD = $(LIBGUAC_LTLIB) @CUNIT_LIBS@ test_libguac_LDADD = @LIBGUAC_LTLIB@ @CUNIT_LIBS@