Fix up pretty printing.

* Add *_HOSTCC, *_LINK and *_CIFY macros to avoid confusion.
* Move cruft to the bottom where nobody sees it.

diff --git a/Makefile.in b/Makefile.in
index 4c1af22..2f89152 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,15 +4,6 @@
 # You may use, modify and redistribute this file under the terms of the
 # GNU General Public License version 2. (see COPYING.GPL)
 
-# silent-rules
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
@@ -63,7 +54,7 @@ graphjs.h
 all: darkstat
 
 darkstat: $(OBJS)
-       $(AM_V_CC)
+       $(AM_V_LINK)
        $(AM_V_at)$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
 
 .c.o:
@@ -88,15 +79,17 @@ depend: config.status $(STATICHS)
 show-dep:
        @echo $(CPP) $(CPPFLAGS) -MM $(SRCS)
 
-# Statics: (FIXME?)
-graphjs.h: static/graph.js c-ify
-       ./c-ify graph_js <static/graph.js >$@
+graphjs.h: static/graph.js
+       $(AM_V_CIFY)
+       $(AM_V_at)./c-ify graph_js <static/graph.js >$@
 
-stylecss.h: static/style.css c-ify
-       ./c-ify style_css <static/style.css >$@
+stylecss.h: static/style.css
+       $(AM_V_CIFY)
+       $(AM_V_at)./c-ify style_css <static/style.css >$@
 
+$(STATICHS): c-ify
 c-ify: static/c-ify.c
-       $(AM_V_CC)
+       $(AM_V_HOSTCC)
        $(AM_V_at)$(HOSTCC) $(HOSTCFLAGS) static/c-ify.c -o $@
 
 install: darkstat
@@ -107,6 +100,24 @@ install: darkstat
 
 .PHONY: all install clean depend show-dep
 
+# silent-rules
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_LINK = $(am__v_LINK_$(V))
+am__v_LINK_ = $(am__v_LINK_$(AM_DEFAULT_VERBOSITY))
+am__v_LINK_0 = @echo "  LINK  " $@;
+AM_V_HOSTCC = $(am__v_HOSTCC_$(V))
+am__v_HOSTCC_ = $(am__v_HOSTCC_$(AM_DEFAULT_VERBOSITY))
+am__v_HOSTCC_0 = @echo "  HOSTCC" $@;
+AM_V_CIFY = $(am__v_CIFY_$(V))
+am__v_CIFY_ = $(am__v_CIFY_$(AM_DEFAULT_VERBOSITY))
+am__v_CIFY_0 = @echo "  C-IFY " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+
 # Automatically generated dependencies
 acct.o: acct.c acct.h decode.h addr.h conv.h config.h daylog.h graph_db.h \
  err.h cdefs.h hosts_db.h localip.h now.h opt.h