X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/72f5a0d69ad43e7329064f415b4f8df3c1c2ccec..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 5dcef0f..2f93b87 100644
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,27 @@
 # slstatus - suckless status monitor
 .POSIX:
 
-include os.mk
 include config.mk
 
 REQ = util
 COM =\
-	components/$(OS)/battery \
-	components/$(OS)/cpu \
+	components/battery\
+	components/cpu\
 	components/datetime\
 	components/disk\
-	components/$(OS)/entropy \
+	components/entropy\
 	components/hostname\
 	components/ip\
 	components/kernel_release\
 	components/keyboard_indicators\
+	components/keymap\
 	components/load_avg\
+	components/netspeeds\
 	components/num_files\
-	components/$(OS)/ram \
+	components/ram\
 	components/run_command\
-	components/$(OS)/swap \
+	components/separator\
+	components/swap\
 	components/temperature\
 	components/uptime\
 	components/user\
@@ -29,18 +31,17 @@ COM =\
 
 all: slstatus
 
-slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-slstatus.o: slstatus.c slstatus.h arg.h config.h $(REQ:=.h)
 $(COM:=.o): config.mk $(REQ:=.h)
+slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(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) -o $@ -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)