From 9becfe7f97e337622a0bf716d70ae6912e3eeb74 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Fri, 12 Feb 2010 14:19:10 +0100 Subject: Use AM_CPPFLAGS instead of deprecated INCLUDES --- dev/Makefile.am | 2 +- src/Makefile.am | 2 +- swig/Makefile.am | 4 ++-- tools/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/Makefile.am b/dev/Makefile.am index 9b3ec6a..17b67db 100644 --- a/dev/Makefile.am +++ b/dev/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS) AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index 87fada0..5fa37d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) diff --git a/swig/Makefile.am b/swig/Makefile.am index 6852aad..0953a56 100644 --- a/swig/Makefile.am +++ b/swig/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir) +AM_CPPFLAGS = -I$(top_srcdir)/include $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir) if HAVE_SWIG BUILT_SOURCES = imobiledevice_wrap.cxx @@ -28,7 +28,7 @@ _imobiledevice_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) _imobiledevice_la_LIBADD = $(top_builddir)/src/libimobiledevice.la $(libplistmm_LIBS) imobiledevice_wrap.cxx : $(SWIG_SOURCES) - $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $< + $(SWIG) $(SWIG_PYTHON_OPT) $(AM_CPPFLAGS) -I$(top_srcdir)/src -o $@ $< endif # HAVE_SWIG diff --git a/tools/Makefile.am b/tools/Makefile.am index 472ebab..04ff7bb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(GLOBAL_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS) AM_LDFLAGS = $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) -- cgit v1.1-32-gdbae