From 82dcdacc1ab462b87b261c665fecc7a0a78dfa44 Mon Sep 17 00:00:00 2001 From: Siraaj Khandkar Date: Wed, 29 Aug 2018 14:39:26 -0400 Subject: [PATCH] Re-use AWK build recipe --- Makefile | 90 +++++++++++++++++--------------------------------------- 1 file changed, 27 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index 9b1553b..f516fb9 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,12 @@ AWK_EXECUTABLES := \ bin/khatus_parse_udevadm_monitor_block \ bin/khatus_parse_upower +define BUILD_AWK_EXE + echo '#! $(PATH_TO_AWK) -f' > $@ && \ + cat $^ >> $@ && \ + chmod +x $@ +endef + .PHONY: \ build \ clean @@ -39,41 +45,31 @@ bin/khatus_bar: \ src/awk/lib/msg_in.awk \ src/awk/lib/msg_out.awk \ src/awk/lib/util.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_actuate_alert_to_notify_send: \ src/awk/exe/actuate_alert_to_notify_send.awk \ src/awk/lib/msg_in.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_actuate_device_add_to_automount: \ src/awk/exe/actuate_device_add_to_automount.awk \ src/awk/lib/msg_in.awk \ src/awk/lib/msg_out.awk \ src/awk/lib/alert.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_actuate_status_bar_to_xsetroot_name: \ src/awk/exe/actuate_status_bar_to_xsetroot_name.awk \ src/awk/lib/msg_in.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_monitor_devices: \ src/awk/exe/monitor_devices.awk \ src/awk/lib/msg_in.awk \ src/awk/lib/msg_out.awk \ src/awk/lib/alert.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_monitor_energy: \ src/awk/exe/monitor_energy.awk \ @@ -81,114 +77,82 @@ bin/khatus_monitor_energy: \ src/awk/lib/msg_out.awk \ src/awk/lib/alert.awk \ src/awk/lib/util.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_monitor_errors: \ src/awk/exe/monitor_errors.awk \ src/awk/lib/msg_in.awk \ src/awk/lib/msg_out.awk \ src/awk/lib/alert.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_bluetoothctl_show: \ src/awk/exe/parse_bluetoothctl_show.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_df_pcent: \ src/awk/exe/parse_df_pcent.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_fan_file: \ src/awk/exe/parse_fan_file.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_free: \ src/awk/exe/parse_free.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_ip_addr: \ src/awk/exe/parse_ip_addr.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_iwconfig: \ src/awk/exe/parse_iwconfig.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_loadavg_file: \ src/awk/exe/parse_loadavg_file.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) 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 - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_mpd_status_currentsong: \ src/awk/exe/parse_mpd_status_currentsong.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_pactl_list_sinks: \ src/awk/exe/parse_pactl_list_sinks.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_ps: \ src/awk/exe/parse_ps.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_sys_block_stat: \ src/awk/exe/parse_sys_block_stat.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_udevadm_monitor_block: \ src/awk/exe/parse_udevadm_monitor_block.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) bin/khatus_parse_upower: \ src/awk/exe/parse_upower.awk \ src/awk/lib/msg_out.awk - echo '#! $(PATH_TO_AWK) -f' > $@ - cat $^ >> $@ - chmod +x $@ + $(BUILD_AWK_EXE) -- 2.20.1