From: Roy Marples <roy@marples.name>
Date: Fri, 7 Oct 2016 09:42:38 +0000 (+0000)
Subject: Fix build system to make import correctly for authentication.
X-Git-Tag: v6.11.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e43c5c2b8aa14dd47da448beed12895d92ac8e64;p=thirdparty%2Fdhcpcd.git

Fix build system to make import correctly for authentication.
---

diff --git a/Makefile b/Makefile
index 54519c7e..9d825719 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ CPPFLAGS+=	-I./crypt
 SRCS+=		${DHCPCD_SRCS}
 DHCPCD_DEFS?=	dhcpcd-definitions.conf
 
-OBJS+=		${SRCS:.c=.o} ${AUTH_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
+OBJS+=		${SRCS:.c=.o} ${CRYPT_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
 
 SCRIPT=		${LIBEXECDIR}/dhcpcd-run-hooks
 HOOKDIR=	${LIBEXECDIR}/dhcpcd-hooks
@@ -91,8 +91,8 @@ dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in
 
 if-options.c: dhcpcd-embedded.h
 
-.depend: ${SRCS} ${COMPAT_SRCS} ${AUTH_SRCS}
-	${CC} ${CPPFLAGS} -MM ${SRCS} ${COMPAT_SRCS} ${AUTH_SRCS} > .depend
+.depend: ${SRCS} ${COMPAT_SRCS} ${CRYPT_SRCS}
+	${CC} ${CPPFLAGS} -MM ${SRCS} ${COMPAT_SRCS} ${CRYPT_SRCS} > .depend
 
 depend: .depend
 
@@ -172,10 +172,10 @@ import: ${SRCS} hooks
 		sed -e '/^compat\//d' | \
 		sed -e '/^crypt\//d' | \
 		sort -u) /tmp/${DISTPREFIX}; \
-	if test -n "${AUTH_SRCS}"; then \
+	if test -n "${CRYPT_SRCS}"; then \
 		${INSTALL} -d /tmp/${DISTPREFIX}/crypt; \
-		cp ${AUTH_SRCS} /tmp/${DISTPREFIX}/crypt; \
-		cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${AUTH_SRCS} | \
+		cp ${CRYPT_SRCS} /tmp/${DISTPREFIX}/crypt; \
+		cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${CRYPT_SRCS} | \
 			sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
 			tr ' ' '\n' | sed -e '/\/\.\.\//d'  | \
 			sort -u) /tmp/${DISTPREFIX}/crypt; \
diff --git a/configure b/configure
index 8f4f23fc..b47f91e1 100755
--- a/configure
+++ b/configure
@@ -462,10 +462,11 @@ if [ -z "$INET6" -o "$INET6" = yes ]; then
 	fi
 fi
 if [ -z "$AUTH" -o "$AUTH" = yes ]; then
-	echo "Enabling Authentiaction"
+	echo "Enabling Authentication"
 	echo "CPPFLAGS+=	-DAUTH" >>$CONFIG_MK
-	echo "AUTH_SRCS=	auth.c crypt/hmac_md5.c" >>$CONFIG_MK
-	echo "AUTH_SRCS+=	\${MD5_SRC} \${SHA256_SRC}" >>$CONFIG_MK
+	echo "SRCS+=		auth.c" >>$CONFIG_MK
+	echo "CRYPT_SRCS+=	crypt/hmac_md5.c" >>$CONFIG_MK
+	echo "CRYPT_SRCS+=	\${MD5_SRC} \${SHA256_SRC}" >>$CONFIG_MK
 fi
 
 echo "Using compiler .. $CC"