summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-07-30 09:46:33 +0000
committerRoy Marples <roy@marples.name>2014-07-30 09:46:33 +0000
commit5c9c7e301b255b6007d394cac21a5cdca4177d03 (patch)
tree7f85eb78e3fffc01bfa81f95300167841823f374 /Makefile
parentf53e7bdce8527d4879102f8953f486ef6dd8c5eb (diff)
downloaddhcpcd-5c9c7e301b255b6007d394cac21a5cdca4177d03.tar.xz
Fix the import to work on Linux as well.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index bd4b9550..7bdf879c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,9 @@ CFLAGS+= -std=${CSTD}
SRCS+= ${DHCPCD_SRCS}
-.PATH: ./crypt
-
-VPATH= . ./crypt
-
SRCS+= auth.c
CPPFLAGS+= -I./crypt
-CRYPT_SRCS= hmac_md5.c ${MD5_SRC} ${SHA256_SRC}
+CRYPT_SRCS= crypt/hmac_md5.c ${MD5_SRC} ${SHA256_SRC}
OBJS+= ${SRCS:.c=.o} ${COMPAT_SRCS:.c=.o} ${CRYPT_SRCS:.c=.o}
@@ -159,13 +155,10 @@ import: ${SRCS}
sort -u) /tmp/${DISTPREFIX}; \
if test -n "${CRYPT_SRCS}"; then \
${INSTALL} -d /tmp/${DISTPREFIX}/crypt; \
- cp $$(echo ${CRYPT_SRCS} | tr ' ' '\n' | \
- sed -e 's:^:crypt/:g') \
- /tmp/${DISTPREFIX}/crypt; \
- cp $$(cd crypt && ${CC} ${CPPFLAGS} -MM ${CRYPT_SRCS} | \
+ cp ${CRYPT_SRCS} /tmp/${DISTPREFIX}/crypt; \
+ cp $$(${CC} ${CPPFLAGS} -MM ${CRYPT_SRCS} | \
sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
- tr ' ' '\n' | sed -e '/config.h/d' \
- -e 's:^:crypt/:g' | \
+ tr ' ' '\n' | sed -e '/\/\.\.\//d' | \
sort -u) /tmp/${DISTPREFIX}/crypt; \
fi;
if test -n "${COMPAT_SRCS}"; then \