buildsys: move mkhooktypes to include build phase, as well as serno.h generation

Author: kaniini

Makefile

@@ -6,23 +6,10 @@ DISTCLEAN = extra.mk buildsys.mk config.log config.status atheme-services.pc
 -include buildsys.mk
 
 # explicit dependencies need to be expressed to ensure parallel builds don't die
-pre-recurse: include/serno.h include/hooktypes.h
-pre-depend: pre-recurse
-libathemecore: $(LIBMOWGLI)
+libathemecore: include $(LIBMOWGLI)
 modules: libathemecore
 src: libathemecore
 
-include/serno.h:
-	@revh=; \
-	if [ -d .git ]; then \
-		revh=`git log -1 --pretty=oneline | cut -d' ' -f1 2>/dev/null` || :; \
-	fi; \
-	if [ -z "$$revh" ] && [ ! -r include/serno.h ]; then \
-		revh=`sed -ne 's/^node: \(............\).*/\1/p' .hg_archival.txt 2>/dev/null` || :; \
-		[ -n "$$revh" ] || revh=unknown; \
-	fi; \
-	[ -z "$$revh" ] || echo "#define SERNO \"$$revh\"" >include/serno.h
-
 install-extra:
 	@echo "----------------------------------------------------------------"
 	@echo ">>> Remember to cd to ${prefix} and edit your config file.";
@@ -57,9 +44,6 @@ dist:
 	hg manifest | awk '{ print "$(DISTNAME)/"$$1; } END { print "$(DISTNAME)/configure"; print "$(DISTNAME)/aclocal.m4"; print "$(DISTNAME)/include/sysconf.h.in"; print "$(DISTNAME)/include/serno.h"; }' | $(TAR) -chnzf $(DISTNAME).tar.gz -T /dev/stdin
 	$(RM) $(DISTNAME)
 
-include/hooktypes.h: ${SRCDIR}/libathemecore/mkhooktypes.sh ${SRCDIR}/libathemecore/hooktypes.in
-	(cd libathemecore && touch .depend && ${MAKE} ../include/hooktypes.h)
-
 buildsys.mk:
 	@echo "Run ./configure first you idiot."
 	@exit 1

include/Makefile

@@ -2,7 +2,8 @@ include ../extra.mk
 
 SUBDIRS = inline protocol
 
-DISTCLEAN = serno.h
+DISTCLEAN = hooktypes.h serno.h
+pre-depend: ${DISTCLEAN}
 
 INCLUDES = \
 	abirev.h		\
@@ -58,4 +59,13 @@ INCLUDES = \
 	uplink.h		\
 	users.h
 
+hooktypes.h:
+	$(info Generate: $@)
+	@sh mkhooktypes.sh hooktypes.in >hooktypes.h
+
+serno.h:
+	$(info Generate: $@)
+	@revh=`git log -1 --pretty=oneline | cut -d' ' -f1 2>/dev/null` || :; \
+	[ -z "$$revh" ] || echo "#define SERNO \"$$revh\"" >serno.h
+
 include ../buildsys.mk

libathemecore/hooktypes.in renamed to include/hooktypes.in

@@ -65,17 +65,9 @@ SRCS = ${BASE_SRCS} version.c
 include ../buildsys.mk
 include ../extra.mk
 
-.c.c.dep: ../include/hooktypes.h ../include/serno.h
-
 CPPFLAGS	+= $(MOWGLI_CFLAGS) $(PCRE_CFLAGS) -I../include -DBINDIR=\"$(bindir)\"
 CFLAGS		+= $(LIB_CFLAGS)
 LIBS		+= $(MOWGLI_LIBS) $(PCRE_LIBS) $(LIBINTL)
 LDFLAGS         += $(LDFLAGS_RPATH)
 
 build: depend all
-
-../include/hooktypes.h: mkhooktypes.sh hooktypes.in
-	sh mkhooktypes.sh hooktypes.in >../include/hooktypes.h
-
-../include/serno.h:
-	(cd ..; ${MAKE} include/serno.h)