[hotssh] Split libgssh into standalone shared library
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hotssh] Split libgssh into standalone shared library
- Date: Wed, 15 Jan 2014 19:29:08 +0000 (UTC)
commit 22eead8f367219c1a555d7a51b78e2d7db0e3554
Author: Colin Walters <walters verbum org>
Date: Wed Jan 15 14:28:35 2014 -0500
Split libgssh into standalone shared library
So it can be reused by Cockpit and eventually gvfs.
Makefile-libgssh.am | 27 -
Makefile-src.am | 4 +-
Makefile.am | 1 -
configure.ac | 7 +-
libgssh/gssh-channel-input-stream.c | 257 --------
libgssh/gssh-channel-input-stream.h | 36 --
libgssh/gssh-channel-output-stream.c | 340 -----------
libgssh/gssh-channel-output-stream.h | 36 --
libgssh/gssh-channel-private.h | 54 --
libgssh/gssh-channel.c | 197 ------
libgssh/gssh-channel.h | 43 --
libgssh/gssh-connection-private.h | 79 ---
libgssh/gssh-connection.c | 1113 ----------------------------------
libgssh/gssh-connection.h | 121 ----
libgssh/gssh-enum-types.c.template | 38 --
libgssh/gssh-enum-types.h.template | 22 -
libgssh/gssh-types.h | 26 -
libgssh/gssh.h | 24 -
18 files changed, 3 insertions(+), 2422 deletions(-)
---
diff --git a/Makefile-src.am b/Makefile-src.am
index 071dbab..2ece4df 100644
--- a/Makefile-src.am
+++ b/Makefile-src.am
@@ -39,8 +39,8 @@ hotssh_SOURCES = $(hotssh_headers) \
$(NULL)
hotssh_CPPFLAGS = $(AM_CPPFLAGS) -DLOCALEDIR=\"$(localedir)\"
-hotssh_CFLAGS = $(AM_CFLAGS) $(BUILDDEP_HOTSSHAPP_CFLAGS) -I$(srcdir)/libgsystem -I$(srcdir)/libgssh
-I$(srcdir)/src
-hotssh_LDADD = $(BUILDDEP_HOTSSHAPP_LIBS) libgssh.la libgsystem.la
+hotssh_CFLAGS = $(AM_CFLAGS) $(BUILDDEP_HOTSSHAPP_CFLAGS) -I$(srcdir)/libgsystem -I$(srcdir)/src
+hotssh_LDADD = $(BUILDDEP_HOTSSHAPP_LIBS) libgsystem.la
resources.c: src/hotssh.gresource.xml $(shell glib-compile-resources --sourcedir=$(srcdir)/src
--generate-dependencies $(srcdir)/src/hotssh.gresource.xml)
$(AM_V_GEN) glib-compile-resources $< \
diff --git a/Makefile.am b/Makefile.am
index 67e938c..d7cce68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,6 @@ libgsystem_libs = $(BUILDDEP_GIO_UNIX_LIBS)
include libgsystem/Makefile-libgsystem.am
noinst_LTLIBRARIES += libgsystem.la
-include Makefile-libgssh.am
include Makefile-src.am
release-tag:
diff --git a/configure.ac b/configure.ac
index 191e89a..f963039 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,12 +38,7 @@ PKG_PROG_PKG_CONFIG
GLIB_GSETTINGS
PKG_CHECK_MODULES(BUILDDEP_GIO_UNIX, [gio-unix-2.0 >= 2.34])
-PKG_CHECK_MODULES(BUILDDEP_HOTSSHAPP, [gio-unix-2.0 >= 2.34 gtk+-3.0 >= 3.10.0 vte-2.90])
-PKG_CHECK_MODULES(BUILDDEP_LIBGSSH, [gio-unix-2.0 libssh])
-save_LIBS=$LIBS
-LIBS=$BUILDDEP_LIBGSSH_LIBS
-AC_CHECK_FUNC(ssh_get_poll_flags,,AC_MSG_ERROR([You must have libssh 0.6 with ssh_get_poll_flags]))
-LIBS=$save_LIBS
+PKG_CHECK_MODULES(BUILDDEP_HOTSSHAPP, [gio-unix-2.0 >= 2.34 gtk+-3.0 >= 3.10.0 vte-2.90 libgssh-1])
AC_CONFIG_FILES([
Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]