Shift X2 status from legacy to archived

[khatus.git] / x2 / Makefile

diff --git a/x2/Makefile b/x2/Makefile
index c2d3f52..063ead5 100644 (file)
--- a/x2/Makefile
+++ b/x2/Makefile
@@ -18,7 +18,7 @@ AWK_EXECUTABLES := \
        bin/khatus_parse_ip_addr \
        bin/khatus_parse_iwconfig \
        bin/khatus_parse_loadavg_file \
-       bin/khatus_parse_metar_d_output \
+       bin/khatus_parse_noaa_api \
        bin/khatus_parse_mpd_status_currentsong \
        bin/khatus_parse_pactl_list_sinks \
        bin/khatus_parse_ps \
@@ -27,6 +27,7 @@ AWK_EXECUTABLES := \
        bin/khatus_parse_upower
 BASH_EXECUTABLE_NAMES := \
        khatus \
+       khatus_sensor_bluetooth \
        khatus_sensor_bluetooth_power \
        khatus_sensor_datetime \
        khatus_sensor_devices \
@@ -38,6 +39,7 @@ BASH_EXECUTABLE_NAMES := \
        khatus_sensor_memory \
        khatus_sensor_mpd \
        khatus_sensor_net_addr_io \
+       khatus_sensor_net_carrier \
        khatus_sensor_net_wifi_status \
        khatus_sensor_procs \
        khatus_sensor_screen_brightness \
@@ -67,14 +69,28 @@ endef
 
 .PHONY: \
        build \
+       rebuild \
        install \
+       uninstall \
+       reinstall \
        clean
 
 build: | bin
 build: $(EXECUTABLES)
 
 install:
-       $(foreach filename,$(wildcard bin/*),cp -p "$(filename)" "$(PREFIX)/$(filename)"; )
+       @$(foreach filename,$(wildcard bin/*),cp -p "$(filename)" "$(PREFIX)/$(filename)"; )
+
+uninstall:
+       @$(foreach filename,$(wildcard $(PREFIX)/bin/khatus*),rm "$(filename)"; )
+
+reinstall:
+       @$(MAKE) -s uninstall
+       @$(MAKE) -s install
+
+rebuild:
+       @$(MAKE) -s clean
+       @$(MAKE) -s build
 
 clean:
        rm -rf bin
@@ -174,8 +190,12 @@ bin/khatus_parse_loadavg_file: \
        src/awk/lib/msg.awk
        $(BUILD_AWK_EXE)
 
-bin/khatus_parse_metar_d_output: \
-       src/awk/exe/parse_metar_d_output.awk \
+# Order of dependencies is important for khatus_parse_noaa_api!
+# parse_hxpipe MUST appear before parse_noaa_api, because the order in
+# which they match lines matters!
+bin/khatus_parse_noaa_api: \
+       src/awk/lib/parse_hxpipe.awk \
+       src/awk/exe/parse_noaa_api.awk \
        src/awk/lib/msg.awk \
        src/awk/lib/str.awk
        $(BUILD_AWK_EXE)