GNOME.org
 

[seahorse] Makefile.am: Remove use of libtool since we don't make libraries

commit 990b49524da17e232a004a95873251b35d2d557c
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 3 17:33:38 2014 +0100

    Makefile.am: Remove use of libtool since we don't make libraries
    
    seahorse doesn't make libraries. No need to mess around with
    ugly nastiness like libtool.

 Makefile.am                        |    2 +-
 common/Makefile.am                 |    6 +++---
 configure.ac                       |    9 +--------
 gkr/Makefile.am                    |    7 +++----
 libegg/Makefile.am                 |   20 +++++++++-----------
 libseahorse/Makefile.am            |    7 ++-----
 libseahorse/seahorse-application.c |   21 ---------------------
 libseahorse/seahorse-passphrase.c  |    2 --
 pgp/Makefile.am                    |   10 +++-------
 pkcs11/Makefile.am                 |    8 ++++----
 src/Makefile.am                    |   16 ++++++++--------
 src/seahorse-main.c                |   26 ++++++++++++++++++++++++++
 ssh/Makefile.am                    |    9 +++++----
 13 files changed, 65 insertions(+), 78 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 48ef992..1ce0abe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ upload-release: $(DIST_ARCHIVES)
        scp $(DIST_ARCHIVES) master.gnome.org:
        ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)
 
-noinst_LTLIBRARIES =
+noinst_LIBRARIES =
 bin_PROGRAMS =
 man_MANS =
 
diff --git a/common/Makefile.am b/common/Makefile.am
index d208bde..488c1af 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
 
-noinst_LTLIBRARIES += libcommon.la
+noinst_LIBRARIES += libcommon.a
 
 common_VALA = \
        common/actions.vala \
@@ -23,11 +23,11 @@ common_C = $(common_VALA:.vala=.c)
 
 common_HEADER = common/seahorse-common.h
 
-libcommon_la_SOURCES = \
+libcommon_a_SOURCES = \
        $(common_C) \
        common/seahorse-common.h
 
-libcommon_la_CFLAGS = \
+libcommon_a_CFLAGS = \
        -include config.h -w
 
 if WITH_VALAC
diff --git a/configure.ac b/configure.ac
index df0cf86..d7bf03e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_INTLTOOL([0.35.0])
-AM_PROG_LIBTOOL
+AC_PROG_RANLIB
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 GETTEXT_PACKAGE=seahorse
@@ -60,13 +60,6 @@ esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
-if test "$platform_win32" = "yes" ; then
-       PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined"
-else
-       PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
-fi
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
-
 AC_MSG_CHECKING(whether to build with valac)
 AC_ARG_ENABLE(valac,
               AC_HELP_STRING([--disable-valac],
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 2b5660d..71afe6f 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -1,6 +1,5 @@
 
-noinst_LTLIBRARIES += \
-       libseahorse-gkr.la
+noinst_LIBRARIES += libseahorse-gkr.a
 
 gkr_VALA = \
        gkr/gkr-backend.vala \
@@ -18,10 +17,10 @@ gkr_HEADER = gkr/seahorse-gkr.h
 
 gkr_C = $(gkr_VALA:.vala=.c)
 
-libseahorse_gkr_la_SOURCES = \
+libseahorse_gkr_a_SOURCES = \
        $(gkr_C) $(gkr_HEADER)
 
-libseahorse_gkr_la_CFLAGS = \
+libseahorse_gkr_a_CFLAGS = \
        -include config.h -w \
        -DSECRET_API_SUBJECT_TO_CHANGE
 
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index 0ac35b1..086b59d 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -1,19 +1,17 @@
-noinst_LTLIBRARIES += \
-       libeggdatetime.la \
-       libeggtreemultidnd.la
+noinst_LIBRARIES += \
+       libeggdatetime.a \
+       libeggtreemultidnd.a
 
-libeggdatetime_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
+libeggdatetime_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
                                 -DGDK_DISABLE_DEPRECATED \
                                 -DG_DISABLE_DEPRECATED
 
-libeggdatetime_la_LIBADD = $(GTK_LIBS)
-libeggdatetime_la_CFLAGS = $(GTK_CFLAGS)
-libeggdatetime_la_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c
+libeggdatetime_a_CFLAGS = $(GTK_CFLAGS)
+libeggdatetime_a_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c
 
-libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
+libeggtreemultidnd_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
                                 -DGDK_DISABLE_DEPRECATED \
                                 -DG_DISABLE_DEPRECATED
 
-libeggtreemultidnd_la_LIBADD = $(GTK_LIBS)
-libeggtreemultidnd_la_CFLAGS = $(GTK_CFLAGS)
-libeggtreemultidnd_la_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h
+libeggtreemultidnd_a_CFLAGS = $(GTK_CFLAGS)
+libeggtreemultidnd_a_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index bd02e70..0a9bd59 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -19,7 +19,7 @@ BUILT_SOURCES += \
        $(dbus_shell_search_provider_built_sources) \
        $(MARSHAL_SRCS)
 
-noinst_LTLIBRARIES += libseahorse.la
+noinst_LIBRARIES += libseahorse.a
 
 if WITH_KEYSERVER
 KEYSERVER_SRCS = libseahorse/seahorse-keyserver-control.c libseahorse/seahorse-keyserver-control.h
@@ -27,7 +27,7 @@ else
 KEYSERVER_SRCS = 
 endif
 
-libseahorse_la_SOURCES = \
+libseahorse_a_SOURCES = \
        libseahorse/seahorse-application.c libseahorse/seahorse-application.h \
        libseahorse/seahorse-bind.c libseahorse/seahorse-bind.h \
        libseahorse/seahorse-collection.c libseahorse/seahorse-collection.h \
@@ -51,9 +51,6 @@ libseahorse_la_SOURCES = \
        $(MARSHAL_SRCS) \
        $(KEYSERVER_SRCS)
 
-libseahorse_la_LIBADD = \
-       libcommon.la
-
 seahorse-marshal.h: libseahorse/seahorse-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
 
diff --git a/libseahorse/seahorse-application.c b/libseahorse/seahorse-application.c
index 0c86bb4..a043284 100644
--- a/libseahorse/seahorse-application.c
+++ b/libseahorse/seahorse-application.c
@@ -26,9 +26,6 @@
 
 #include "seahorse-common.h"
 
-#include "pgp/seahorse-pgp.h"
-#include "ssh/seahorse-ssh.h"
-
 #include "seahorse-search-provider.h"
 
 #include <gtk/gtk.h>
@@ -88,30 +85,12 @@ seahorse_application_finalize (GObject *gobject)
        G_OBJECT_CLASS (seahorse_application_parent_class)->finalize (gobject);
 }
 
-#ifdef WITH_PKCS11
-void seahorse_pkcs11_backend_initialize (void);
-#endif
-
-void seahorse_gkr_backend_initialize (void);
-
 static void
 seahorse_application_startup (GApplication *application)
 {
        /* Insert Icons into Stock */
        seahorse_icons_init ();
 
-       /* Initialize the various components */
-#ifdef WITH_PGP
-       seahorse_pgp_backend_initialize ();
-#endif
-#ifdef WITH_SSH
-       seahorse_ssh_backend_initialize ();
-#endif
-#ifdef WITH_PKCS11
-       seahorse_pkcs11_backend_initialize ();
-#endif
-       seahorse_gkr_backend_initialize ();
-
        seahorse_search_provider_initialize (SEAHORSE_APPLICATION (application)->search_provider);
 
        /* HACK: get the inactivity timeout started */
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index 4155d87..387a8ea 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -47,8 +47,6 @@
 #include <gcr/gcr.h>
 
 #include "seahorse-passphrase.h"
-#include "seahorse-util.h"
-#include "seahorse-widget.h"
 
 #define HIG_SMALL      6        /* gnome hig small space in pixels */
 #define HIG_LARGE     12        /* gnome hig large space in pixels */
diff --git a/pgp/Makefile.am b/pgp/Makefile.am
index 033f53c..d13852f 100644
--- a/pgp/Makefile.am
+++ b/pgp/Makefile.am
@@ -1,5 +1,5 @@
 
-noinst_LTLIBRARIES += libseahorse-pgp.la
+noinst_LIBRARIES += libseahorse-pgp.a
 
 if WITH_LDAP
 LDAP_SRCS = pgp/seahorse-ldap-source.c pgp/seahorse-ldap-source.h
@@ -20,7 +20,7 @@ pgp_KEYSERVER_SRCS += pgp/seahorse-keyserver-sync.c pgp/seahorse-keyserver-sync.
 pgp_KEYSERVER_SRCS += pgp/seahorse-keyserver-results.c pgp/seahorse-keyserver-results.h
 endif
 
-libseahorse_pgp_la_SOURCES = \
+libseahorse_pgp_a_SOURCES = \
        pgp/seahorse-combo-keys.c pgp/seahorse-combo-keys.h \
        pgp/seahorse-discovery.c pgp/seahorse-discovery.h \
        pgp/seahorse-gpgme.c pgp/seahorse-gpgme.h \
@@ -62,11 +62,7 @@ libseahorse_pgp_la_SOURCES = \
        $(LDAP_SRCS) \
        $(HKP_SRCS)
 
-libseahorse_pgp_la_LIBADD = \
-       libcommon.la \
-       libseahorse.la
-
-libseahorse_pgp_la_CFLAGS = \
+libseahorse_pgp_a_CFLAGS = \
        -DLDAP_DEPRECATED
 
 seahorselibexecbin_PROGRAMS += xloadimage
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 291563d..a4a8c60 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -1,6 +1,6 @@
 
-noinst_LTLIBRARIES += \
-       libseahorse-pkcs11.la
+noinst_LIBRARIES += \
+       libseahorse-pkcs11.a
 
 pkcs11_VALA = \
        pkcs11/certificate-der-exporter.vala \
@@ -18,12 +18,12 @@ pkcs11_HEADER = pkcs11/seahorse-pkcs11.h
 
 pkcs11_C = $(pkcs11_VALA:.vala=.c)
 
-libseahorse_pkcs11_la_SOURCES = \
+libseahorse_pkcs11_a_SOURCES = \
        $(pkcs11_C) $(pkcs11_HEADER) \
        pkcs11/seahorse-pkcs11-backend.c pkcs11/seahorse-pkcs11-backend.h \
        pkcs11/seahorse-pkcs11-generate.c pkcs11/seahorse-pkcs11-generate.h
 
-libseahorse_pkcs11_la_CFLAGS = \
+libseahorse_pkcs11_a_CFLAGS = \
        -include config.h -w
 
 if WITH_VALAC
diff --git a/src/Makefile.am b/src/Makefile.am
index afbf2c7..a7d169d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,18 @@
 
 if WITH_PGP
-PGP_LDADD = libseahorse-pgp.la
+PGP_LDADD = libseahorse-pgp.a
 else
 PGP_LDADD = 
 endif
 
 if WITH_SSH
-SSH_LDADD = libseahorse-ssh.la
+SSH_LDADD = libseahorse-ssh.a
 else
 SSH_LDADD = 
 endif
 
 if WITH_PKCS11
-PKCS11_LDADD = libseahorse-pkcs11.la
+PKCS11_LDADD = libseahorse-pkcs11.a
 else
 PKCS11_LDADD = 
 endif
@@ -27,14 +27,14 @@ seahorse_SOURCES = \
        src/seahorse-sidebar.c src/seahorse-sidebar.h
 
 seahorse_LDADD = \
-       libcommon.la \
-       libseahorse.la \
        $(PGP_LDADD) \
        $(SSH_LDADD) \
        $(PKCS11_LDADD) \
-       libseahorse-gkr.la \
-       libeggdatetime.la \
-       libeggtreemultidnd.la \
+       libseahorse.a \
+       libseahorse-gkr.a \
+       libcommon.a \
+       libeggdatetime.a \
+       libeggtreemultidnd.a \
        $(SEAHORSE_LIBS)
 
 ui_DATA += \
diff --git a/src/seahorse-main.c b/src/seahorse-main.c
index 7eaeac2..8c565ca 100644
--- a/src/seahorse-main.c
+++ b/src/seahorse-main.c
@@ -28,6 +28,8 @@
 #include "libseahorse/seahorse-servers.h"
 #include "libseahorse/seahorse-util.h"
 
+#include "pgp/seahorse-pgp.h"
+#include "ssh/seahorse-ssh.h"
 
 #include <glib/gi18n.h>
 
@@ -41,6 +43,29 @@ on_application_activate (GApplication *application,
        seahorse_key_manager_show (GDK_CURRENT_TIME);
 }
 
+#ifdef WITH_PKCS11
+void seahorse_pkcs11_backend_initialize (void);
+#endif
+
+void seahorse_gkr_backend_initialize (void);
+
+static void
+on_application_startup (GApplication *application,
+                        gpointer user_data)
+{
+       /* Initialize the various components */
+#ifdef WITH_PGP
+       seahorse_pgp_backend_initialize ();
+#endif
+#ifdef WITH_SSH
+       seahorse_ssh_backend_initialize ();
+#endif
+#ifdef WITH_PKCS11
+       seahorse_pkcs11_backend_initialize ();
+#endif
+       seahorse_gkr_backend_initialize ();
+}
+
 /* Initializes context and preferences, then loads key manager */
 int
 main (int argc, char **argv)
@@ -60,6 +85,7 @@ main (int argc, char **argv)
 
        application = seahorse_application_new ();
        g_signal_connect (application, "activate", G_CALLBACK (on_application_activate), NULL);
+       g_signal_connect (application, "startup", G_CALLBACK (on_application_startup), NULL);
        status = g_application_run (G_APPLICATION (application), argc, argv);
 
        seahorse_registry_cleanup ();
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index 010b52f..c7b436a 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -1,7 +1,7 @@
 
-noinst_LTLIBRARIES += libseahorse-ssh.la
+noinst_LIBRARIES += libseahorse-ssh.a
 
-libseahorse_ssh_la_SOURCES = \
+libseahorse_ssh_a_SOURCES = \
        ssh/seahorse-ssh.h ssh/seahorse-ssh.c \
        ssh/seahorse-ssh-actions.c ssh/seahorse-ssh-actions.h \
        ssh/seahorse-ssh-backend.c ssh/seahorse-ssh-backend.h \
@@ -18,9 +18,10 @@ libseahorse_ssh_la_SOURCES = \
 
 seahorselibexecbin_PROGRAMS += seahorse-ssh-askpass
 
-seahorse_ssh_askpass_SOURCES = ssh/seahorse-ssh-askpass.c
+seahorse_ssh_askpass_SOURCES = \
+       libseahorse/seahorse-passphrase.c \
+       ssh/seahorse-ssh-askpass.c
 seahorse_ssh_askpass_LDADD = \
-       libseahorse.la \
        $(SEAHORSE_LIBS)
 
 ui_DATA += \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]