[gnome-online-accounts] build: Port away from gnome-common



commit 1f069d27cbf238c316e7b7fa97048a05a298dcc4
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Oct 26 16:02:11 2017 +0200

    build: Port away from gnome-common
    
    See: https://wiki.gnome.org/Projects/GnomeCommon/Migration

 configure.ac                |   16 +++++++++++++---
 src/daemon/Makefile.am      |    4 ++++
 src/examples/Makefile.am    |    5 +++++
 src/goa/Makefile.am         |    3 ++-
 src/goabackend/Makefile.am  |    1 +
 src/goaidentity/Makefile.am |    4 ++++
 6 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 61f8df3..b7e6544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,10 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_MAINTAINER_MODE([enable])
 
-GNOME_DEBUG_CHECK
+AX_IS_RELEASE([git-directory])
+
+AX_CHECK_ENABLE_DEBUG([yes],,, [$ax_is_release])
+AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS], [$ax_is_release])
 
 AC_PROG_CC
 AC_ISC_POSIX
@@ -66,9 +69,8 @@ AC_DEFINE(GOA_MICRO_VERSION,
 # Initialization
 #
 
+AX_REQUIRE_DEFINED([GLIB_GSETTINGS])
 GLIB_GSETTINGS
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
 
 AC_ARG_ENABLE([documentation],
        AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
@@ -81,6 +83,7 @@ if test x$enable_documentation = xyes; then
    fi
 fi
 
+AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
 GTK_DOC_CHECK([1.3])
 
 # Libraries
@@ -90,7 +93,9 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0 gio-2.0 gio-unix-2.0 >= 2.52])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
 GOBJECT_INTROSPECTION_CHECK([0.6.2])
+
 VAPIGEN_CHECK()
 
 # Telepathy
@@ -495,10 +500,15 @@ fi
 # Internationalization
 #
 
+AX_REQUIRE_DEFINED([IT_PROG_INTLTOOL])
 IT_PROG_INTLTOOL([0.50.1])
+
 GETTEXT_PACKAGE=gnome-online-accounts
 AC_SUBST([GETTEXT_PACKAGE])
+
+AX_REQUIRE_DEFINED([AM_GLIB_GNU_GETTEXT])
 AM_GLIB_GNU_GETTEXT
+
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 
 # goaconfig.h
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 5f9a231..662d18a 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -44,6 +44,10 @@ goa_daemon_LDADD =                                           \
        $(REST_LIBS)                                            \
        $(NULL)
 
+goa_daemon_LDFLAGS =                                           \
+       $(WARN_LDFLAGS)                                         \
+       $(NULL)
+
 clean-local :
        rm -f *~
 
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 155814e..2daa07c 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -20,10 +20,12 @@ noinst_PROGRAMS = list-accounts lastfm-shout
 list_accounts_SOURCES = list-accounts.c
 list_accounts_CFLAGS = $(GLIB_CFLAGS)
 list_accounts_LDADD = $(GLIB_LIBS) ../goa/libgoa-1.0.la
+list_accounts_LDFLAGS = $(WARN_LDFLAGS)
 
 lastfm_shout_SOURCES = lastfm-shout.c
 lastfm_shout_CFLAGS = $(GLIB_CFLAGS) $(REST_CFLAGS)
 lastfm_shout_LDADD = $(GLIB_LIBS) $(REST_LIBS) ../goa/libgoa-1.0.la
+lastfm_shout_LDFLAGS = $(WARN_LDFLAGS)
 
 if BUILD_BACKEND
 noinst_PROGRAMS += introspect-providers list-providers add-pocket
@@ -31,14 +33,17 @@ noinst_PROGRAMS += introspect-providers list-providers add-pocket
 introspect_providers_SOURCES = introspect-providers.c
 introspect_providers_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
 introspect_providers_LDADD = $(GLIB_LIBS) $(GTK_LIBS) ../goabackend/libgoa-backend-1.0.la 
../goa/libgoa-1.0.la
+introspect_providers_LDFLAGS = $(WARN_LDFLAGS)
 
 list_providers_SOURCES = list-providers.c
 list_providers_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
 list_providers_LDADD = $(GLIB_LIBS) $(GTK_LIBS) ../goabackend/libgoa-backend-1.0.la ../goa/libgoa-1.0.la
+list_providers_LDFLAGS = $(WARN_LDFLAGS)
 
 add_pocket_SOURCES = add-pocket.c
 add_pocket_CFLAGS = $(GLIB_CFLAGS) $(REST_CFLAGS)
 add_pocket_LDADD = $(GLIB_LIBS) $(REST_LIBS) ../goa/libgoa-1.0.la
+add_pocket_LDFLAGS = $(WARN_LDFLAGS)
 endif
 
 clean-local :
diff --git a/src/goa/Makefile.am b/src/goa/Makefile.am
index 653372e..7d45ea3 100644
--- a/src/goa/Makefile.am
+++ b/src/goa/Makefile.am
@@ -102,6 +102,7 @@ libgoa_1_0_la_LIBADD =                                              \
        $(NULL)
 
 libgoa_1_0_la_LDFLAGS =                                        \
+       $(WARN_LDFLAGS)                                         \
        -version-info $(GOA_LT_VERSION)                         \
        $(NULL)
 
@@ -120,7 +121,7 @@ Goa_1_0_gir_EXPORT_PACKAGES = goa-1.0
 Goa_1_0_gir_LIBS = goa-1.0
 Goa_1_0_gir_FILES = $(libgoa_1_0_la_HEADERS) $(libgoa_1_0_la_SOURCES)
 Goa_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(libgoa_1_0_la_CFLAGS)
-Goa_1_0_gir_SCANNERFLAGS = --c-include='goa/goa.h'
+Goa_1_0_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --c-include='goa/goa.h'
 INTROSPECTION_GIRS += Goa-1.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 7d6340a..c325731 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -149,6 +149,7 @@ libgoa_backend_1_0_la_LIBADD =                                      \
        $(NULL)
 
 libgoa_backend_1_0_la_LDFLAGS =                                \
+       $(WARN_LDFLAGS)                                         \
        -version-info $(GOA_BACKEND_LT_VERSION)                 \
        $(NULL)
 
diff --git a/src/goaidentity/Makefile.am b/src/goaidentity/Makefile.am
index 0187b2e..49404b6 100644
--- a/src/goaidentity/Makefile.am
+++ b/src/goaidentity/Makefile.am
@@ -122,6 +122,10 @@ goa_identity_service_LDADD =                                       \
        $(GCR_LIBS)                                             \
        $(NULL)
 
+goa_identity_service_LDFLAGS =                                         \
+       $(WARN_LDFLAGS)                                         \
+       $(NULL)
+
 else
 EXTRA_DIST += $(identity_sources)
 endif


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