diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-20 12:10:51 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-20 12:10:51 +0000 |
| commit | dd16c4c2043cd65543b7aa08078290e3687402d4 (patch) | |
| tree | 712251aac99575ffed4eec790eb31abfebb8fe85 | |
| parent | b4a069f27314a3c1d75a97e73f492d805e7c298d (diff) | |
| download | libayatana-indicator-dd16c4c2043cd65543b7aa08078290e3687402d4.tar.gz libayatana-indicator-dd16c4c2043cd65543b7aa08078290e3687402d4.tar.bz2 libayatana-indicator-dd16c4c2043cd65543b7aa08078290e3687402d4.zip | |
**/Makefile.am: Set -DGTK_DISABLE_DEPRECATED for gtk2 builds. Fixes FTBFS against Glib2.0 >= 2.62.
| -rw-r--r-- | libayatana-indicator/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libayatana-indicator/Makefile.am b/libayatana-indicator/Makefile.am index d9260ea..fe8425c 100644 --- a/libayatana-indicator/Makefile.am +++ b/libayatana-indicator/Makefile.am @@ -4,6 +4,7 @@ lib_LTLIBRARIES = libayatana-indicator3.la else VER= lib_LTLIBRARIES = libayatana-indicator.la +GTK_DISABLE_DEPRECATED = -DGTK_DISABLE_DEPRECATED endif BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c @@ -64,6 +65,7 @@ endif libayatana_indicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(GTK_DISABLE_DEPRECATED) \ -DG_LOG_DOMAIN=\"libayatana-indicator\" \ -Wall -Werror -Wno-error=deprecated-declarations diff --git a/tests/Makefile.am b/tests/Makefile.am index 93fcd14..3d7ea3b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ if USE_GTK3 INDICATOR_LIB = -layatana-indicator3 else INDICATOR_LIB = -layatana-indicator +GTK_DISABLE_DEPRECATED = -DGTK_DISABLE_DEPRECATED endif TESTS = @@ -93,6 +94,7 @@ libdummy_indicator_blank_la_SOURCES = \ libdummy_indicator_blank_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_blank_la_LIBADD = \ @@ -113,6 +115,7 @@ libdummy_indicator_null_la_SOURCES = \ libdummy_indicator_null_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_null_la_LIBADD = \ @@ -133,6 +136,7 @@ libdummy_indicator_signaler_la_SOURCES = \ libdummy_indicator_signaler_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_signaler_la_LIBADD = \ @@ -153,6 +157,7 @@ libdummy_indicator_simple_la_SOURCES = \ libdummy_indicator_simple_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_simple_la_LIBADD = \ @@ -174,6 +179,7 @@ libdummy_indicator_entry_func_la_SOURCES = \ libdummy_indicator_entry_func_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_entry_func_la_LIBADD = \ @@ -194,6 +200,7 @@ libdummy_indicator_visible_la_SOURCES = \ libdummy_indicator_visible_la_CFLAGS = \ -Wall -Werror \ + $(GTK_DISABLE_DEPRECATED) \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_visible_la_LIBADD = \ |