2 files changed, 20 insertions, 17 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index f6e9ac0db180..9d3d0c3ae058 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -17,7 +17,7 @@ USES=		compiler:c++11-lib
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	FILESDIR="${FILESDIR}"
-CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+CPPFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	TEST
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile
index 2602f8264550..7ac01495429c 100644
--- a/devel/android-tools-adb-devel/files/Makefile
+++ b/devel/android-tools-adb-devel/files/Makefile
@@ -62,25 +62,28 @@ SRCS+= threads.c
 .PATH: ${.CURDIR}/../liblog
 SRCS+= fake_log_device.c
 SRCS+= logd_write.c
-CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
-
-CFLAGS+= -DADB_HOST=1
-CFLAGS+= -DHAVE_FORKEXEC=1
-CFLAGS+= -DHAVE_SYMLINKS
-CFLAGS+= -DHAVE_TERMIO_H
-CFLAGS+= -DHAVE_SYS_SOCKET_H
-CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
-CFLAGS+= -I${.CURDIR}/../base/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
 
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -DHAVE_SYS_SOCKET_H
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
 CXXFLAGS+= -std=gnu++11
-CXXFLAGS+= ${CFLAGS:N-std*}
 
-TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
+.endif
+
+TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
-CFLAGS.${f}+= ${TEST_CFLAGS}
+CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
 .endfor
 
 LDADD+= -lcrypto -lpthread -lusb -lz
@@ -90,6 +93,6 @@ TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
 GTEST_CONFIG?= gtest-config
 
 adb_test: ${SRCS:R:S/$/.o/:Nmain.o:Ncommandline.o} ${TEST_SRCS:R:S/$/.o/}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
+	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
 
 .include <bsd.prog.mk>