[hotssh] Switch to standalone libgsystem



commit 9836f20a5620c07994582685ea8cc6e5888eb013
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 6 05:06:35 2014 -0500

    Switch to standalone libgsystem

 .gitmodules     |    3 ---
 Makefile-src.am |    4 ++--
 Makefile.am     |    6 ------
 autogen.sh      |    2 --
 configure.ac    |    2 +-
 libgsystem      |    1 -
 6 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/Makefile-src.am b/Makefile-src.am
index 2ece4df..cb54a9e 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)/src
-hotssh_LDADD = $(BUILDDEP_HOTSSHAPP_LIBS) libgsystem.la
+hotssh_CFLAGS = $(AM_CFLAGS) $(BUILDDEP_HOTSSHAPP_CFLAGS) -I$(srcdir)/src
+hotssh_LDADD = $(BUILDDEP_HOTSSHAPP_LIBS)
 
 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 029c30a..2db3fbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,12 +22,6 @@ AM_CFLAGS += $(WARN_CFLAGS)
 EXTRA_DIST += autogen.sh COPYING
 GITIGNOREFILES += aclocal.m4 build-aux config.h.in m4
 
-libgsystem_srcpath := libgsystem
-libgsystem_cflags = $(BUILDDEP_GIO_UNIX_CFLAGS) -I$(srcdir)/libgsystem
-libgsystem_libs = $(BUILDDEP_GIO_UNIX_LIBS)
-include libgsystem/Makefile-libgsystem.am
-noinst_LTLIBRARIES += libgsystem.la
-
 include Makefile-src.am
 
 release-tag:
diff --git a/autogen.sh b/autogen.sh
index 1a7ab51..5533ff4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,8 +17,6 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-git submodule update --init --recursive
-
 REQUIRED_AUTOCONF_VERSION=2.59
 REQUIRED_AUTOMAKE_VERSION=1.9
 REQUIRED_INTLTOOL_VERSION=0.40.0
diff --git a/configure.ac b/configure.ac
index f963039..d043105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +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 libgssh-1])
+PKG_CHECK_MODULES(BUILDDEP_HOTSSHAPP, [gio-unix-2.0 >= 2.34 gtk+-3.0 >= 3.10.0 vte-2.90 libgsystem 
libgssh-1])
 
 AC_CONFIG_FILES([
 Makefile


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]