diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2016-10-05 20:09:19 -0700 |
|---|---|---|
| committer | Philip Chimento <philip@endlessm.com> | 2016-10-21 15:53:09 -0700 |
| commit | 8a7ffea548a3e57a31e094d609c0d293f9ff1661 (patch) | |
| tree | a68eb1394dce600ae93e543463449d504995aff8 | |
| parent | 56fe20f2da79d8819b1087d8f4edb42d5fb8e6fe (diff) | |
| download | gjs-wip/ptomato/warnings.tar.gz | |
build: Switch to AX_COMPILER_FLAGSwip/ptomato/warnings
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
| -rw-r--r-- | Makefile-insttest.am | 18 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/Makefile-insttest.am b/Makefile-insttest.am index f4b94acb..4bc11653 100644 --- a/Makefile-insttest.am +++ b/Makefile-insttest.am @@ -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)))) diff --git a/Makefile.am b/Makefile.am index 8a5e8c7f..c0df6c2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index e9e421a8..b9e6c923 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |