X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/e04a3853643df1c98a451969d515d8850f138bcc..86849d295b1eb9e18746d8a4fa196fe7b9dce0dc:/Makefile

diff --git a/Makefile b/Makefile
index d657981..945b5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,70 +5,51 @@
 include config.mk
 
 REQ = util
-HDR = arg.h config.h
 COM =\
-	battery\
-	cpu\
-	datetime\
-	disk\
-	entropy\
-	hostname\
-	ip\
-	kernel_release\
-	keyboard_indicators\
-	load_avg\
-	num_files\
-	ram\
-	run_command\
-	swap\
-	temperature\
-	uptime\
-	user\
-	volume\
-	wifi
+	components/battery\
+	components/cpu\
+	components/datetime\
+	components/disk\
+	components/entropy\
+	components/hostname\
+	components/ip\
+	components/kernel_release\
+	components/keyboard_indicators\
+	components/keymap\
+	components/load_avg\
+	components/netspeeds\
+	components/num_files\
+	components/ram\
+	components/run_command\
+	components/swap\
+	components/temperature\
+	components/uptime\
+	components/user\
+	components/volume\
+	components/wifi
 
 all: slstatus
 
-slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-slstatus.o: slstatus.c slstatus.h $(HDR) $(REQ:=.h)
+$(COM:=.o): config.mk $(REQ:=.h)
+slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)
 
-battery.o: battery.c config.mk $(HDR) $(REQ:=.h)
-cpu.o: cpu.c config.mk $(HDR) $(REQ:=.h)
-datetime.o: datetime.c config.mk $(HDR) $(REQ:=.h)
-disk.o: disk.c config.mk $(HDR) $(REQ:=.h)
-entropy.o: entropy.c config.mk $(HDR) $(REQ:=.h)
-hostname.o: hostname.c config.mk $(HDR) $(REQ:=.h)
-ip.o: ip.c config.mk $(HDR) $(REQ:=.h)
-kernel_release.o: kernel_release.c config.mk $(HDR) $(REQ:=.h)
-keyboard_indicators.o: keyboard_indicators.c config.mk $(HDR) $(REQ:=.h)
-load_avg.o: load_avg.c config.mk $(HDR) $(REQ:=.h)
-num_files.o: num_files.c config.mk $(HDR) $(REQ:=.h)
-ram.o: ram.c config.mk $(HDR) $(REQ:=.h)
-run_command.o: run_command.c config.mk $(HDR) $(REQ:=.h)
-swap.o: swap.c config.mk $(HDR) $(REQ:=.h)
-temperature.o: temperature.c config.mk $(HDR) $(REQ:=.h)
-uptime.o: uptime.c config.mk $(HDR) $(REQ:=.h)
-user.o: user.c config.mk $(HDR) $(REQ:=.h)
-volume.o: volume.c config.mk $(HDR) $(REQ:=.h)
-wifi.o: wifi.c config.mk $(HDR) $(REQ:=.h)
+.c.o:
+	$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 config.h:
 	cp config.def.h $@
 
-.o:
-	$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
+	$(CC) -o $@ $(LDFLAGS) $(COM:=.o) $(REQ:=.o) slstatus.o $(LDLIBS)
 
 clean:
 	rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
 dist:
 	rm -rf "slstatus-$(VERSION)"
-	mkdir -p "slstatus-$(VERSION)"
+	mkdir -p "slstatus-$(VERSION)/components"
 	cp -R LICENSE Makefile README config.mk config.def.h \
-	      $(HDR) slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
+	      arg.h slstatus.c $(COM:=.c) $(REQ:=.c) $(REQ:=.h) \
 	      slstatus.1 "slstatus-$(VERSION)"
 	tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
 	rm -rf "slstatus-$(VERSION)"