summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-17 19:30:46 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-17 19:41:27 +0200
commitced4f1adfd1b7b8424a121cb3ffe8376c5fbf3da (patch)
tree107eda15f849a35480e2746aedce6bf4b6f9c43f
parent6f4d2c8afbde16fdaf06cb3b3701041c8edbb35a (diff)
downloadspice-ced4f1adfd1b7b8424a121cb3ffe8376c5fbf3da.tar.gz
spice-ced4f1adfd1b7b8424a121cb3ffe8376c5fbf3da.tar.xz
spice-ced4f1adfd1b7b8424a121cb3ffe8376c5fbf3da.zip
build-sys: fix some automake warning
client/Makefile.am:199: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') server/tests/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
-rw-r--r--client/Makefile.am2
-rw-r--r--server/tests/Makefile.am4
m---------spice-common0
3 files changed, 3 insertions, 3 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index ba3ce767..ebc6ce0d 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -196,7 +196,7 @@ spicec_SOURCES += \
endif
-INCLUDES = \
+AM_CPPFLAGS = \
-D__STDC_LIMIT_MACROS \
$(PLATFORM_INCLUDES) \
-I$(top_srcdir)/spice-common \
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 655bc83c..f4ae661b 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/server \
@@ -11,7 +11,7 @@ INCLUDES = \
$(NULL)
if SUPPORT_AUTOMATED_TESTS
-INCLUDES += -DAUTOMATED_TESTS
+AM_CPPFLAGS += -DAUTOMATED_TESTS
endif
LDADD = \
diff --git a/spice-common b/spice-common
-Subproject fe93908238196bd632287fc9875e6f2e11105d0
+Subproject 3363fe79f9d450774dd018a794c0b4381c1ef0a