From: Roy Marples <roy@marples.name>
Date: Tue, 3 Oct 2017 14:50:27 +0000 (+0100)
Subject: Compile eloop with config.h by default and bring in compat modules.
X-Git-Tag: v7.0.0-rc3~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77f724eb9c76c8476027eaff44aa0f0e0f99c8c2;p=thirdparty%2Fdhcpcd.git

Compile eloop with config.h by default and bring in compat modules.
This allows us to build this test AND dhcpcd exactly the same,
which is important as they build eloop.o in the same place.
---

diff --git a/tests/eloop-bench/Makefile b/tests/eloop-bench/Makefile
index 90d25878..a0d30983 100644
--- a/tests/eloop-bench/Makefile
+++ b/tests/eloop-bench/Makefile
@@ -9,9 +9,9 @@ CFLAGS?=	-O2
 CSTD?=		c99
 CFLAGS+=	-std=${CSTD}
 
-CPPFLAGS+=	-DNO_CONFIG_H
-CPPFLAGS+=	-DQUEUE_H=../compat/queue.h
-CPPFLAGS+=	-I${TOP}/src
+#CPPFLAGS+=	-DNO_CONFIG_H
+#CPPFLAGS+=	-DQUEUE_H=../compat/queue.h
+CPPFLAGS+=	-I${TOP} -I${TOP}/src
 
 # Default is to let eloop decide
 #CPPFLAGS+=	-DHAVE_KQUEUE
@@ -19,8 +19,10 @@ CPPFLAGS+=	-I${TOP}/src
 #CPPFLAGS+=	-DHAVE_PSELECT
 #CPPFLAGS+=	-DHAVE_EPOLL
 #CPPFLAGS+=	-DHAVE_PPOLL
+CPPFLAGS+=	-DWARN_SELECT
 
-OBJS+=          ${SRCS:.c=.o}
+PCOMPAT_SRCS=   ${COMPAT_SRCS:compat/%=${TOP}/compat/%}
+OBJS+=          ${SRCS:.c=.o} ${PCOMPAT_SRCS:.c=.o}
 
 .c.o: Makefile
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
@@ -36,7 +38,7 @@ distclean: clean
 depend:
 
 ${PROG}: ${DEPEND} ${OBJS}
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
+	${CC} ${LDFLAGS} -o $@ ${OBJS}
 
 test: ${PROG}
 	./${PROG}