From: Roy Marples <roy@marples.name>
Date: Mon, 19 Sep 2016 13:00:45 +0000 (+0000)
Subject: Make import now imports the files needed to generate dhcpcd-embedded.{c,h}
X-Git-Tag: v6.11.4~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4cf220370102449370a51c8a32b3e08505fd579;p=thirdparty%2Fdhcpcd.git

Make import now imports the files needed to generate dhcpcd-embedded.{c,h}
and bundles a small definition.
---

diff --git a/Makefile b/Makefile
index 253678c1..1fd6808c 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,8 @@ _confinstall:
 	${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
 	test -e ${DESTDIR}${SYSCONFDIR}/dhcpcd.conf || \
 		${INSTALL} -m ${CONFMODE} dhcpcd.conf ${DESTDIR}${SYSCONFDIR}
+hooks:
+	cd dhcpcd-hooks; ${MAKE}; cd ..; done
 
 eginstall:
 	for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@; cd ..; done
@@ -153,13 +155,19 @@ snapshot:
 	tar cf - -C /tmp ${DISTPREFIX} | xz >${DISTFILE}
 	ls -l ${DISTFILE}
 
-import: ${SRCS}
+import: ${SRCS} hooks
 	rm -rf /tmp/${DISTPREFIX}
 	${INSTALL} -d /tmp/${DISTPREFIX}
-	cp ${SRCS} dhcpcd.conf dhcpcd-definitions.conf *.in /tmp/${DISTPREFIX}
-	cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${SRCS} | \
+	cp genembedc genembedh /tmp/${DISTPREFIX}
+	cp $$(echo ${SRCS} | sed -e 's/\(dhcpcd-embedded.[ch]\)/\1.in/') \
+		/tmp/${DISTPREFIX}
+	cp dhcpcd.conf dhcpcd-definitions.conf *.in /tmp/${DISTPREFIX}
+	cp dhcpcd-definitions-small.conf *.in /tmp/${DISTPREFIX}
+	cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM \
+		$$(echo ${SRCS} | sed -e 's/dhcpcd-embedded.c//') | \
 		sed -e 's/^.*\.c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
 		tr ' ' '\n' | \
+		sed -e '/^dhcpcd-embedded.h$$/d' | \
 		sed -e '/^compat\//d' | \
 		sed -e '/^crypt\//d' | \
 		sort -u) /tmp/${DISTPREFIX}; \