Commit bef3138c authored by Philip Chimento's avatar Philip Chimento 🚮 Committed by Philip Chimento

build: Switch to AX_COMPILER_FLAGS

This gets rid of the last depdenency on gnome-common, switching from
GNOME_COMPILE_WARNINGS to AX_COMPILER_FLAGS.

See: https://wiki.gnome.org/Projects/GnomeCommon/Migration

https://bugzilla.gnome.org/show_bug.cgi?id=773297
parent 7a1d069a
......@@ -97,7 +97,11 @@ libgimarshallingtests_la_LIBADD = $(common_test_libadd)
Regress-1.0.gir: libregress.la
Regress_1_0_gir_LIBS = libregress.la
Regress_1_0_gir_FILES = $(nodist_libregress_la_SOURCES)
Regress_1_0_gir_SCANNERFLAGS = --warn-all --warn-error $(libregress_scannerflags_includes)
Regress_1_0_gir_SCANNERFLAGS = \
--warn-all --warn-error \
$(libregress_scannerflags_includes) \
$(WARN_SCANNERFLAGS) \
$(NULL)
if !ENABLE_CAIRO
Regress_1_0_gir_CFLAGS = -D_GI_DISABLE_CAIRO
endif
......@@ -107,14 +111,22 @@ WarnLib-1.0.gir: libwarnlib.la
WarnLib_1_0_gir_LIBS = libwarnlib.la
WarnLib_1_0_gir_INCLUDES = Gio-2.0
WarnLib_1_0_gir_FILES = $(nodist_libwarnlib_la_SOURCES)
WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_
WarnLib_1_0_gir_SCANNERFLAGS = \
--c-include="warnlib.h" \
--symbol-prefix=warnlib_ \
$(WARN_SCANNERFLAGS) \
$(NULL)
TEST_INTROSPECTION_GIRS += WarnLib-1.0.gir
GIMarshallingTests-1.0.gir: libgimarshallingtests.la
GIMarshallingTests_1_0_gir_LIBS = libgimarshallingtests.la
GIMarshallingTests_1_0_gir_INCLUDES = Gio-2.0
GIMarshallingTests_1_0_gir_FILES = $(nodist_libgimarshallingtests_la_SOURCES)
GIMarshallingTests_1_0_gir_SCANNERFLAGS = --symbol-prefix=gi_marshalling_tests --warn-all --warn-error
GIMarshallingTests_1_0_gir_SCANNERFLAGS = \
--symbol-prefix=gi_marshalling_tests \
--warn-all --warn-error \
$(WARN_SCANNERFLAGS) \
$(NULL)
TEST_INTROSPECTION_GIRS += GIMarshallingTests-1.0.gir
$(foreach gir,$(TEST_INTROSPECTION_GIRS),$(eval $(call introspection-scanner,$(gir))))
......
......@@ -18,7 +18,7 @@ INTROSPECTION_GIRS =
ACLOCAL_AMFLAGS = -I m4
AM_CXXFLAGS = $(WARN_CXXFLAGS) $(CODE_COVERAGE_CFLAGS)
AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gjs\" $(CODE_COVERAGE_CPPFLAGS)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
AM_LDFLAGS = $(WARN_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
......@@ -177,7 +177,12 @@ GjsPrivate-1.0.gir: libgjs.la
GjsPrivate_1_0_gir_LIBS = libgjs.la
GjsPrivate_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
GjsPrivate_1_0_gir_FILES = $(libgjs_private_source_files)
GjsPrivate_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gjs --symbol-prefix=gjs_ --warn-all
GjsPrivate_1_0_gir_SCANNERFLAGS = \
--identifier-prefix=Gjs \
--symbol-prefix=gjs_ \
--warn-all \
$(WARN_SCANNERFLAGS) \
$(NULL)
if ENABLE_GTK
GjsPrivate_1_0_gir_INCLUDES += Gtk-3.0
......
......@@ -40,7 +40,7 @@ AC_PROG_MKDIR_P
AC_PROG_LN_S
AC_PROG_SED
GNOME_CXX_WARNINGS([maximum])
AX_COMPILER_FLAGS
AX_CODE_COVERAGE
dnl Clang does not need to link with -lgcov
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment