Redesign message format

[khatus.git] / Makefile

diff --git a/Makefile b/Makefile
index 5dbefc2..1f39234 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,10 @@ AWK_EXECUTABLES := \
        bin/khatus_parse_upower
 
 define BUILD_AWK_EXE
-       echo '#! $(PATH_TO_AWK) -f' > $@ && \
-       echo 'BEGIN {Module = "$(notdir $@)"}' >> $@ && \
-       cat $^ >> $@ && \
+       echo '#! $(PATH_TO_AWK) -f'                                > $@ && \
+       echo 'BEGIN {Node   = Node ? Node : "$(shell hostname)"}' >> $@ && \
+       echo 'BEGIN {Module = "$(notdir $@)"}'                    >> $@ && \
+       cat $^                                                    >> $@ && \
        chmod +x $@
 endef
 
@@ -46,42 +47,49 @@ clean:
 bin/khatus_bar: \
        src/awk/exe/bar.awk \
        src/awk/lib/cache.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk \
        src/awk/lib/msg_out.awk \
-       src/awk/lib/util.awk
+       src/awk/lib/num.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_actuate_alert_to_notify_send: \
        src/awk/exe/actuate_alert_to_notify_send.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_actuate_device_add_to_automount: \
        src/awk/exe/actuate_device_add_to_automount.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk \
        src/awk/lib/msg_out.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_actuate_status_bar_to_xsetroot_name: \
        src/awk/exe/actuate_status_bar_to_xsetroot_name.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_monitor_devices: \
        src/awk/exe/monitor_devices.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk \
        src/awk/lib/msg_out.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_monitor_energy: \
        src/awk/exe/monitor_energy.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk \
        src/awk/lib/msg_out.awk \
-       src/awk/lib/util.awk
+       src/awk/lib/num.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_monitor_errors: \
        src/awk/exe/monitor_errors.awk \
+       src/awk/lib/str.awk \
        src/awk/lib/msg_in.awk \
        src/awk/lib/msg_out.awk
        $(BUILD_AWK_EXE)
@@ -124,7 +132,7 @@ bin/khatus_parse_loadavg_file: \
 bin/khatus_parse_metar_d_output: \
        src/awk/exe/parse_metar_d_output.awk \
        src/awk/lib/msg_out.awk \
-       src/awk/lib/util.awk
+       src/awk/lib/str.awk
        $(BUILD_AWK_EXE)
 
 bin/khatus_parse_mpd_status_currentsong: \