GNOME.org
 

[gnome-dictionary] Stop installing libgdict

commit 2f984583cb9f03d84b82a5c56e38fcfa42d13942
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Apr 11 21:52:35 2017 +0100

    Stop installing libgdict
    
    As nobody has been using it for the past 10 years, I think it's time to
    consider the experiment concluded, and just turn libgdict into a private
    library.

 configure.ac                |   48 +++++------------------
 libgdict/Makefile.am        |   57 +++-----------------------
 libgdict/gdict-1.0.pc.in    |   12 ------
 libgdict/gdict-utils.c      |    1 -
 libgdict/gdict-utils.h      |    4 ++
 libgdict/gdict-version.h.in |   91 -------------------------------------------
 libgdict/gdict.h            |    1 -
 src/Makefile.am             |   10 +---
 src/gdict-app.h             |    3 +-
 src/gdict-pref-dialog.h     |    2 +-
 src/gdict-print.c           |    2 -
 src/gdict-print.h           |    2 +-
 src/gdict-source-dialog.h   |    2 +-
 src/gdict-window.c          |    8 +--
 src/gdict-window.h          |    2 +-
 15 files changed, 32 insertions(+), 213 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7d3b744..5fdca59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,11 @@
 dnl -*- mode: m4 -*-
+m4_define([gdict_major_version], [3])
+m4_define([gdict_minor_version], [25])
+m4_define([gdict_micro_version], [1])
+m4_define([gdict_version], [gdict_major_version.gdict_minor_version.gdict_micro_version])
+
 AC_PREREQ(2.63)
-AC_INIT([gnome-dictionary], [3.24.0],
+AC_INIT([gnome-dictionary], [gdict_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-dictionary],
        [gnome-dictionary],
        [http://live.gnome.org/GnomeUtils])
@@ -37,16 +42,6 @@ AC_SUBST(GLIB_MKENUMS)
 AC_SUBST(GLIB_GENMARSHAL)
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
-# Before making a release, the LT_VERSION string should be modified.
-# The string is of the form C:R:A.
-# - If interfaces have been changed or added, but binary compatibility has
-#   been preserved, change to C+1:0:A+1
-# - If binary compatibility has been broken (eg removed or changed interfaces)
-#   change to C+1:0:0
-# - If the interface is the same as the previous version, change to C:R+1:A
-LIBGDICT_LT_VERSION=10:0:0
-AC_SUBST(LIBGDICT_LT_VERSION)
-
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static win32-dll])
 LT_LIB_M
@@ -54,28 +49,6 @@ LT_LIB_M
 ## don't rerun to this point if we abort
 AC_CACHE_SAVE
 
-# For each cycle:
-#      first release: increment major += 1, minor = micro = 0;
-#      each release before API freeze: minor += 1;
-#      each release after API freeze: micro += 1;
-# Even if this library is not part of the developers platform, we
-# follow the same rules: no ABI breakage (unless unavoidable) and
-# no API breakage past the API freeze.
-m4_define([gdict_major_version], [0])
-m4_define([gdict_minor_version], [12])
-m4_define([gdict_micro_version], [0])
-m4_define([gdict_version], [gdict_major_version.gdict_minor_version.gdict_micro_version])
-
-GDICT_MAJOR_VERSION=gdict_major_version
-GDICT_MINOR_VERSION=gdict_minor_version
-GDICT_MICRO_VERSION=gdict_micro_version
-GDICT_VERSION=gdict_version
-
-AC_SUBST(GDICT_MAJOR_VERSION)
-AC_SUBST(GDICT_MINOR_VERSION)
-AC_SUBST(GDICT_MICRO_VERSION)
-AC_SUBST(GDICT_VERSION)
-
 dnl Enable debug messages
 m4_define([debug_default], [m4_if(m4_eval(gdict_minor_version % 2), [1], [yes], [minimum])])
 AC_ARG_ENABLE([debug],
@@ -103,6 +76,10 @@ AS_CASE([$enable_debug],
 
 AC_SUBST(GDICT_DEBUG_CFLAGS)
 
+AC_SUBST(GDICT_MAJOR_VERSION, [gdict_major_version])
+AC_SUBST(GDICT_MINOR_VERSION, [gdict_minor_version])
+AC_SUBST(GDICT_MICRO_VERSION, [gdict_micro_version])
+
 dnl IPv6 support
 msg_ipv6=no
 
@@ -163,14 +140,9 @@ PKG_CHECK_MODULES(GDICT,
                   glib-2.0 >= $GLIB_MIN_VERSION
                   gtk+-3.0 >= $GTK_MIN_VERSION)
 
-# Introspection
-GOBJECT_INTROSPECTION_CHECK([1.42.0])
-
 AC_CONFIG_FILES([
         Makefile
         libgdict/Makefile
-        libgdict/gdict-version.h
-        libgdict/gdict-1.0.pc
         data/Makefile
         docs/Makefile
         help/Makefile
diff --git a/libgdict/Makefile.am b/libgdict/Makefile.am
index 9c4db03..3dc5e18 100644
--- a/libgdict/Makefile.am
+++ b/libgdict/Makefile.am
@@ -11,6 +11,9 @@ AM_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
        -DGDICTSOURCESDIR=\""$(datadir)/gdict-1.0/sources"\"    \
        -DGDICT_ENABLE_INTERNALS=1                              \
+       -DGDICT_MAJOR_VERSION=$(GDICT_MAJOR_VERSION)            \
+       -DGDICT_MINOR_VERSION=$(GDICT_MINOR_VERSION)            \
+       -DGDICT_MICRO_VERSION=$(GDICT_MICRO_VERSION)            \
        -DG_DISABLE_DEPRECATED                                  \
        -DGDK_DISABLE_DEPRECATED                                \
        -UGTK_DISABLE_DEPRECATED                                \
@@ -31,6 +34,7 @@ sources_h = \
        gdict-speller.h                 \
        gdict-strategy-chooser.h        \
        gdict-utils.h                   \
+       gdict.h                         \
        $(NULL)
 
 sources_h_priv = \
@@ -59,64 +63,25 @@ BUILT_SOURCES = \
        gdict-marshal.h         \
        gdict-marshal.c
 
-lib_LTLIBRARIES = libgdict-1.0.la
+noinst_LTLIBRARIES = libgdict-1.0.la
 
 # GNOME Dictionary shared library
 libgdict_1_0_la_SOURCES = $(BUILT_SOURCES) $(sources_h)        $(sources_h_priv) $(sources_c)
 libgdict_1_0_la_CFLAGS = $(GDICT_CFLAGS) $(GDICT_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 libgdict_1_0_la_LIBADD = $(GDICT_LIBS)
-libgdict_1_0_la_LDFLAGS = -version-info $(LIBGDICT_LT_VERSION) -export-dynamic -no-undefined
-
-libgdict_includedir = $(includedir)/gdict-1.0/gdict
-libgdict_include_HEADERS =     \
-       $(sources_h)            \
-       $(srcdir)/gdict.h       \
-       $(NULL)
-
-nodist_libgdict_include_HEADERS = \
-       gdict-enum-types.h      \
-       gdict-version.h         \
-       $(NULL)
+libgdict_1_0_la_LDFLAGS = -export-dynamic -no-undefined
 
 stamp_files = stamp-gdict-enum-types.h stamp-gdict-marshal.h
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-DISTCLEANFILES = gdict-version.h
-MAINTAINERCLEANFILES = $(stamp_files) $(gdict_built_files) gdict-version.h
+MAINTAINERCLEANFILES = $(stamp_files) $(gdict_built_files)
 
 EXTRA_DIST =                   \
-       gdict-version.h.in      \
        gdict-enum-types.h.in   \
        gdict-enum-types.c.in   \
        gdict-marshal.list      \
-       gdict-1.0.pc.in         \
        $(NULL)
 
-# Introspection
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all
-
-if HAVE_INTROSPECTION
-INTROSPECTION_GIRS += Gdict-1.0.gir
-
-Gdict-1.0.gir: libgdict-1.0.la
-Gdict_1_0_gir_NAMESPACE = Gdict
-Gdict_1_0_gir_VERSION = 1.0
-Gdict_1_0_gir_INCLUDES = Gtk-3.0
-Gdict_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdict_1_0_gir_LIBS = libgdict-1.0.la
-Gdict_1_0_gir_FILES = $(libgdict_1_0_la_SOURCES)
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
-
 gdict-marshal.h: stamp-gdict-marshal.h
        @true
 stamp-gdict-marshal.h: gdict-marshal.list Makefile
@@ -148,12 +113,4 @@ gdict-enum-types.c: gdict-enum-types.h gdict-enum-types.c.in Makefile
        && cp xgen-cetc gdict-enum-types.c \
        && rm -f xgen-cetc
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdict-1.0.pc
-
-distclean-local:
-       if test $(srcdir) != .; then \
-               rm -f $(MAINTAINERCLEANFILES); \
-       fi
-
 -include $(top_srcdir)/git.mk
diff --git a/libgdict/gdict-utils.c b/libgdict/gdict-utils.c
index 45a9ffd..7de6c36 100644
--- a/libgdict/gdict-utils.c
+++ b/libgdict/gdict-utils.c
@@ -40,7 +40,6 @@
 #include "gdict-context-private.h"
 #include "gdict-debug.h"
 #include "gdict-utils.h"
-#include "gdict-version.h"
 #include "gdict-private.h"
 
 guint gdict_major_version = GDICT_MAJOR_VERSION;
diff --git a/libgdict/gdict-utils.h b/libgdict/gdict-utils.h
index 963f3bd..ca97f5d 100644
--- a/libgdict/gdict-utils.h
+++ b/libgdict/gdict-utils.h
@@ -81,6 +81,10 @@ void          gdict_init             (gint    *argc,
 void          gdict_debug_init       (gint    *argc,
                                       gchar ***argv);
 
+gboolean      gdict_check_version    (guint    major,
+                                      guint    minor,
+                                      guint    micro);
+
 G_END_DECLS
 
 #endif /* __GDICT_UTILS_H__ */
diff --git a/libgdict/gdict.h b/libgdict/gdict.h
index 57eedd6..0fd2d54 100644
--- a/libgdict/gdict.h
+++ b/libgdict/gdict.h
@@ -30,6 +30,5 @@
 #include "gdict-strategy-chooser.h"
 #include "gdict-utils.h"
 #include "gdict-enum-types.h"
-#include "gdict-version.h"
 
 #endif /* __GDICT_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ebe48e..e28a873 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,8 @@ bin_PROGRAMS = gnome-dictionary
 BUILT_SOURCES = gdict-resources.c
 
 gnome_dictionary_CPPFLAGS = \
+       -I$(top_srcdir)/libgdict \
+       -I$(top_builddir)/libgdict \
        -DPREFIX=\""$(prefix)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DLIBDIR=\""$(libdir)"\" \
@@ -13,13 +15,7 @@ gnome_dictionary_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(NULL)
 
-gnome_dictionary_CFLAGS = \
-       -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/libgdict \
-       -I$(top_builddir)/libgdict \
-       $(GDICT_CFLAGS) \
-       $(NULL)
+gnome_dictionary_CFLAGS = $(GDICT_CFLAGS)
 
 gnome_dictionary_SOURCES = \
        gdict-about.c           \
diff --git a/src/gdict-app.h b/src/gdict-app.h
index 01d71c4..3655579 100644
--- a/src/gdict-app.h
+++ b/src/gdict-app.h
@@ -22,8 +22,7 @@
 #define __GDICT_APP_H__
 
 #include <gtk/gtk.h>
-#include <libgdict/gdict.h>
-
+#include "gdict.h"
 #include "gdict-window.h"
 
 G_BEGIN_DECLS
diff --git a/src/gdict-pref-dialog.h b/src/gdict-pref-dialog.h
index 83281cd..3813fd4 100644
--- a/src/gdict-pref-dialog.h
+++ b/src/gdict-pref-dialog.h
@@ -22,7 +22,7 @@
 #define __GDICT_PREF_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include <libgdict/gdict.h>
+#include "gdict.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gdict-print.c b/src/gdict-print.c
index 3dacb39..c165f75 100644
--- a/src/gdict-print.c
+++ b/src/gdict-print.c
@@ -30,8 +30,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libgdict/gdict.h>
-
 #include "gdict-pref-dialog.h"
 #include "gdict-print.h"
 
diff --git a/src/gdict-print.h b/src/gdict-print.h
index 5d18281..f6874f2 100644
--- a/src/gdict-print.h
+++ b/src/gdict-print.h
@@ -22,7 +22,7 @@
 #define __GDICT_PRINT_H__
 
 #include <gtk/gtk.h>
-#include <libgdict/gdict-defbox.h>
+#include "gdict-defbox.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gdict-source-dialog.h b/src/gdict-source-dialog.h
index c23f218..2f3cf79 100644
--- a/src/gdict-source-dialog.h
+++ b/src/gdict-source-dialog.h
@@ -22,7 +22,7 @@
 #define __GDICT_SOURCE_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include <libgdict/gdict.h>
+#include "gdict.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gdict-window.c b/src/gdict-window.c
index d61b91a..4487ebe 100644
--- a/src/gdict-window.c
+++ b/src/gdict-window.c
@@ -31,15 +31,13 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <libgdict/gdict.h>
-
+#include "gdict-about.h"
+#include "gdict-common.h"
 #include "gdict-database-chooser-button.h"
-#include "gdict-sidebar.h"
 #include "gdict-print.h"
 #include "gdict-pref-dialog.h"
-#include "gdict-about.h"
+#include "gdict-sidebar.h"
 #include "gdict-window.h"
-#include "gdict-common.h"
 
 #define GDICT_WINDOW_COLUMNS      56
 #define GDICT_WINDOW_ROWS         33
diff --git a/src/gdict-window.h b/src/gdict-window.h
index 75fa76d..9eb2100 100644
--- a/src/gdict-window.h
+++ b/src/gdict-window.h
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#include <libgdict/gdict.h>
+#include "gdict.h"
 
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]