diff options
| author | Simon McVittie <smcv@debian.org> | 2016-01-14 06:52:30 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-01-14 06:52:30 +0000 |
| commit | ebda5f95126d6adc38c2511a65e330d472af4f60 (patch) | |
| tree | 18a2381aac7b8e8641f3e6f05ae67e32fec055d2 | |
| parent | be7177fafb94bc3db50843e739df4575d4dabac0 (diff) | |
| download | dbus-glib-ebda5f95126d6adc38c2511a65e330d472af4f60.tar.gz | |
Replace deprecated INCLUDES with AM_CPPFLAGS
| -rw-r--r-- | dbus/Makefile.am | 4 | ||||
| -rw-r--r-- | dbus/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | dbus/examples/statemachine/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/core/Makefile.am | 2 | ||||
| -rw-r--r-- | test/interfaces/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 |
7 files changed, 15 insertions, 8 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 6d885f9..6433224 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . examples -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(DBUS_CFLAGS) \ @@ -110,7 +110,7 @@ Android.mk: Makefile.am androgenizer -:PROJECT dbus-glib -:SHARED libdbus-glib-1 -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:SOURCES $(libdbus_glib_1_la_SOURCES) \ - -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \ + -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ -:LDFLAGS $(libdbus_glib_1_la_LIBADD) $(libdbus_glib_1_la_LDFLAGS) \ > $@ diff --git a/dbus/examples/Makefile.am b/dbus/examples/Makefile.am index 45dc502..867f307 100644 --- a/dbus/examples/Makefile.am +++ b/dbus/examples/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . statemachine -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am index a9b6237..671fcda 100644 --- a/dbus/examples/statemachine/Makefile.am +++ b/dbus/examples/statemachine/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ diff --git a/test/Makefile.am b/test/Makefile.am index 379c8c3..515486b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = lib . core interfaces manual DIST_SUBDIRS = lib core interfaces manual -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ diff --git a/test/core/Makefile.am b/test/core/Makefile.am index 2d66355..27f8c39 100644 --- a/test/core/Makefile.am +++ b/test/core/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/dbus \ -I$(top_builddir) \ diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am index a94d08d..6171a54 100644 --- a/test/interfaces/Makefile.am +++ b/test/interfaces/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/dbus \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 943bd71..57ae527 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,11 @@ -INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(DBUS_X_CFLAGS) \ + $(DBUS_GTK_THREADS_CFLAGS) \ + -DDBUS_COMPILATION \ + $(NULL) nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h libdbus_glibdir = $(includedir)/dbus-1.0/dbus |