From 323ec19dccca6b8930f7175278ae1249700031a5 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 15 May 2013 15:18:13 +0100 Subject: [PATCH] build: Remove INCLUDES directives They have been deprecated for a while, replaced by AM_CPPFLAGS. --- clutter/Makefile.am | 21 +++++++++------------ doc/cookbook/examples/Makefile.am | 14 ++++++-------- doc/reference/cally/Makefile.am | 7 ++++++- doc/reference/clutter/Makefile.am | 8 +++++++- examples/Makefile.am | 12 +++++------- tests/conform/Makefile.am | 12 +++++------- tests/interactive/Makefile.am | 12 +++++------- tests/micro-bench/Makefile.am | 16 +++++++--------- tests/performance/Makefile.am | 17 ++++++++--------- 9 files changed, 58 insertions(+), 61 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index c0d3d5a74..e8d8807c0 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -11,14 +11,6 @@ BUILT_SOURCES = lib_LTLIBRARIES = -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/clutter \ - -I$(top_srcdir)/clutter/cally \ - -I$(top_builddir) \ - -I$(top_builddir)/clutter \ - $(NULL) - AM_CPPFLAGS = \ -DCLUTTER_PREFIX=\""$(prefix)"\" \ -DCLUTTER_LIBDIR=\""$(libdir)"\" \ @@ -28,6 +20,11 @@ AM_CPPFLAGS = \ -DCLUTTER_COMPILATION=1 \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DG_LOG_DOMAIN=\"Clutter\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/clutter \ + -I$(top_srcdir)/clutter/cally \ + -I$(top_builddir) \ + -I$(top_builddir)/clutter \ $(CLUTTER_DEPRECATED_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_PROFILE_CFLAGS) \ @@ -970,7 +967,7 @@ Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \ $(source_c) \ $(deprecated_c) \ $(built_source_c) -Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) +Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0 Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ --warn-all \ @@ -985,7 +982,7 @@ Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@ Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c) -Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) +Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ --warn-all \ --identifier-prefix=Cally \ @@ -1009,7 +1006,7 @@ ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0 ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection) -ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) +ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir endif # SUPPORT_X11 @@ -1026,7 +1023,7 @@ ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = Gdk-3.0 ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_FILES = $(gdk_introspection) -ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) +ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) INTROSPECTION_GIRS += ClutterGdk-@CLUTTER_API_VERSION@.gir endif # SUPPORT_GDK diff --git a/doc/cookbook/examples/Makefile.am b/doc/cookbook/examples/Makefile.am index 054128f7b..b1871113c 100644 --- a/doc/cookbook/examples/Makefile.am +++ b/doc/cookbook/examples/Makefile.am @@ -51,13 +51,6 @@ noinst_PROGRAMS = \ events-buttons-lasso \ $(NULL) -INCLUDES = \ - -I$(top_srcdir)/ \ - -I$(top_builddir)/ \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter \ - $(NULL) - LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la -lm AM_CFLAGS = $(CLUTTER_CFLAGS) @@ -66,7 +59,12 @@ AM_CPPFLAGS = \ -DG_DISABLE_SINGLE_INCLUDES \ -DCOGL_DISABLE_DEPRECATED \ -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ - -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" + -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \ + -I$(top_srcdir)/ \ + -I$(top_builddir)/ \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter \ + $(NULL) AM_LDFLAGS = $(CLUTTER_LIBS) -export-dynamic diff --git a/doc/reference/cally/Makefile.am b/doc/reference/cally/Makefile.am index 797d463e6..4c9a1a057 100644 --- a/doc/reference/cally/Makefile.am +++ b/doc/reference/cally/Makefile.am @@ -78,7 +78,12 @@ expand_content_files= \ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl -I$(top_builddir) -I$(top_builddir)/clutter -I$(top_builddir)/clutter/cogl $(CLUTTER_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir) \ + -I$(top_builddir)/clutter +AM_CFLAGS = $(CLUTTER_CFLAGS) GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index 182adb2c9..e83f445e8 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -170,7 +170,13 @@ expand_content_files = \ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_builddir) -I$(top_builddir)/clutter $(CLUTTER_CFLAGS) -DCLUTTER_DISABLE_DEPRECATION_WARNINGS +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir) \ + -I$(top_builddir)/clutter \ + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS +AM_CFLAGS = $(CLUTTER_CFLAGS) GTKDOC_LIBS = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/examples/Makefile.am b/examples/Makefile.am index 4c6998f64..4b9b4492e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -22,12 +22,6 @@ all_examples += \ image-content endif -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - LDADD = \ $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la \ $(CLUTTER_LIBS) \ @@ -39,7 +33,11 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS) AM_CPPFLAGS = \ -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ -DG_DISABLE_SINGLE_INCLUDES \ - -DGLIB_DISABLE_DEPRECATION_WARNINGS + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter noinst_PROGRAMS = $(all_examples) diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index ba342ac25..93572c114 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -151,18 +151,16 @@ clean-wrappers: # a phony rule that will generate symlink scripts for running individual tests BUILT_SOURCES = wrappers -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - test_conformance_CPPFLAGS = \ -DG_DISABLE_SINGLE_INCLUDES \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DG_DISABLE_DEPRECATION_WARNINGS \ -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ - -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" + -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 93d5fdfd7..8a06328f0 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -136,12 +136,6 @@ clean-wrappers: .PHONY: wrappers clean-wrappers -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la noinst_PROGRAMS = test-interactive @@ -153,7 +147,11 @@ test_interactive_CPPFLAGS = \ -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ -DG_DISABLE_SINGLE_INCLUDES \ -DGLIB_DISABLE_DEPRECATION_WARNINGS \ - -DCLUTTER_DISABLE_DEPRECATION_WARNINGS + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter test_interactive_LDFLAGS = -export-dynamic test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) -lm diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am index 0bb3d5889..03b7cf68e 100644 --- a/tests/micro-bench/Makefile.am +++ b/tests/micro-bench/Makefile.am @@ -9,20 +9,18 @@ noinst_PROGRAMS = \ test-random-text \ test-cogl-perf -INCLUDES = \ +AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) + +AM_CPPFLAGS = \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ + -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/clutter \ -I$(top_builddir)/clutter -AM_CFLAGS = \ - $(CLUTTER_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DGLIB_DISABLE_DEPRECATION_WARNINGS \ - -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ - -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" - LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm test_text_SOURCES = test-text.c diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am index 01262bfc0..7ce59b5ab 100644 --- a/tests/performance/Makefile.am +++ b/tests/performance/Makefile.am @@ -9,22 +9,21 @@ noinst_PROGRAMS = \ test-state-mini \ test-state-pick -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm -AM_CFLAGS = \ - $(CLUTTER_CFLAGS) \ +AM_CFLAGS = $(CLUTTER_CFLAGS) + +AM_CPPFLAGS = \ -DG_DISABLE_SINGLE_INCLUDES \ -DGLIB_DISABLE_DEPRECATION_WARNINGS \ -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ - -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" + -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter perf-report: check