make V=0 output beautification, also build dcs_match_mem.h for fixup

src/gen/Makefile.am

@@ -27,8 +27,12 @@ endif
 dcs_classifier.h dcs_type.c: dcs_classifier.c
 
 dcs_classifier.c: $(srcdir)/gen_dcs_classifier.pl dbfile $(srcdir)/../classes.conf
-	@ if $(AM_V_P); then set -x; else echo "  GEN      dcs_classifier.c ... "; fi; \
-	if [[ -f fixup.remove ]] && [[ -f fixup.reorder ]] ; then \
+	@ if [[ -f fixup.remove ]] && [[ -f fixup.reorder ]] ; then \
+		if $(AM_V_P); then \
+			set -x; \
+		else \
+			echo "  GEN      dcs_classifier.c ... (fixup)"; \
+		fi; \
 		$(srcdir)/gen_dcs_classifier.pl \
 			--key $(DCS_KEY) \
 			--classes $(srcdir)/../classes.conf \
@@ -36,6 +40,11 @@ dcs_classifier.c: $(srcdir)/gen_dcs_classifier.pl dbfile $(srcdir)/../classes.co
 			--reorder fixup.reorder \
 			@DCS_DBFILE_PRE@ dbfile @DCS_DBFILE_POST@ ; \
 	else \
+		if $(AM_V_P); then \
+			set -x; \
+		else \
+			echo "  GEN      dcs_classifier.c ..."; \
+		fi; \
 		$(srcdir)/gen_dcs_classifier.pl \
 			--key $(DCS_KEY) \
 			--classes $(srcdir)/../classes.conf \
@@ -60,7 +69,9 @@ fixup.remove fixup.reorder: fixup.out
 fixup.out:
 	- rm fixup.remove fixup.reorder fixup.out
 	- rm dcs_classifier.c dcs_classifier.h dcs_type.c
-	$(MAKE) $(AM_MAKEFLAGS) dcs_classifier.c dcs_classifier.h dcs_type.c
+	$(MAKE) $(AM_MAKEFLAGS) \
+		dcs_classifier.c dcs_classifier.h \
+		dcs_type.c dcs_match_mem.h
 	( cd .. ; $(MAKE) $(AM_MAKEFLAGS) dcs_test )
 	prev=99999; \
 	while ! ../dcs_test fixup.remove fixup.reorder >>fixup.out ; do \
@@ -71,7 +82,11 @@ fixup.out:
 		fi ; \
 		prev=$$cur ; \
 		( rm dcs_classifier.c dcs_classifier.h ; \
-		  if ! $(MAKE) $(AM_MAKEFLAGS) dcs_classifier.c dcs_classifier.h dcs_type.c ; then break ; fi ; \
+		  if ! $(MAKE) $(AM_MAKEFLAGS) \
+			dcs_classifier.c dcs_classifier.h \
+			dcs_type.c dcs_match_mem.h ; then \
+				break ; \
+		  fi ; \
 		  cd .. ; $(MAKE) $(AM_MAKEFLAGS) dcs_test ) \
 	done