Don't use the deprecated INCLUDES in Makefile.am

This commit is contained in:
Richard Hughes 2013-01-14 09:21:30 +00:00
parent b1f12feb1f
commit 5be743c910
8 changed files with 9 additions and 9 deletions

View file

@ -30,7 +30,7 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
AM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/libupower-glib \

View file

@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(top_builddir) \
@ -65,7 +65,7 @@ introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SO
UPowerGlib-1.0.gir: libupower-glib.la
UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
UPowerGlib_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
UPowerGlib_1_0_gir_LIBS = libupower-glib.la
UPowerGlib_1_0_gir_FILES = $(introspection_sources)

View file

@ -2,7 +2,7 @@
SUBDIRS = dummy freebsd linux openbsd
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Dummy\" \

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Freebsd\" \

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Linux\" \

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Openbsd\" \

View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower\" \
-I$(top_srcdir) \