X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x2%2FMakefile;h=3ccc2b91390f32abccb6135b2fd8d039bc02c9fb;hb=50401a4d45c16bd92210552252a10b7ea9b5c527;hp=c2d3f52e5b8ac985ee4cb8775786e2082f2bba8d;hpb=499c58a269a00e031302938b5a8f006f23aae451;p=khatus.git

diff --git a/x2/Makefile b/x2/Makefile
index c2d3f52..3ccc2b9 100644
--- 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 \
@@ -38,6 +38,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 +68,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 +189,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)