X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/d42870d6ca7fb587b38f8cf6d6821ae33a53a696..cd884c2f0a585f8c6a49f1faacacb7925d75dbb0:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index c68a271..5756418 100644
--- a/Makefile
+++ b/Makefile
@@ -2,57 +2,69 @@
 # 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/$(OS)/temperature \
-	components/$(OS)/uptime \
+	components/swap\
+	components/temperature\
+	components/uptime\
 	components/user\
 	components/volume\
-	components/$(OS)/wifi
-
-SLSCFLAGS  = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
-SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
-SLSLIBS    = -lX11 $(OSLIBS) $(LIBS)
+	components/wifi
 
 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)
+components/battery.o: components/battery.c config.mk $(REQ:=.h)
+components/cpu.o: components/cpu.c config.mk $(REQ:=.h)
+components/datetime.o: components/datetime.c config.mk $(REQ:=.h)
+components/disk.o: components/disk.c config.mk $(REQ:=.h)
+components/entropy.o: components/entropy.c config.mk $(REQ:=.h)
+components/hostname.o: components/hostname.c config.mk $(REQ:=.h)
+components/ip.o: components/ip.c config.mk $(REQ:=.h)
+components/kernel_release.o: components/kernel_release.c config.mk $(REQ:=.h)
+components/keyboard_indicators.o: components/keyboard_indicators.c config.mk $(REQ:=.h)
+components/keymap.o: components/keymap.c config.mk $(REQ:=.h)
+components/load_avg.o: components/load_avg.c config.mk $(REQ:=.h)
+components/netspeeds.o: components/netspeeds.c config.mk $(REQ:=.h)
+components/num_files.o: components/num_files.c config.mk $(REQ:=.h)
+components/ram.o: components/ram.c config.mk $(REQ:=.h)
+components/run_command.o: components/run_command.c config.mk $(REQ:=.h)
+components/swap.o: components/swap.c config.mk $(REQ:=.h)
+components/temperature.o: components/temperature.c config.mk $(REQ:=.h)
+components/uptime.o: components/uptime.c config.mk $(REQ:=.h)
+components/user.o: components/user.c config.mk $(REQ:=.h)
+components/volume.o: components/volume.c config.mk $(REQ:=.h)
+components/wifi.o: components/wifi.c 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 $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
-
-.c.o:
-	$(CC) -o $@ -c $(SLSCFLAGS) $<
+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)
 
-distclean:
-	for os in Linux OpenBSD; do make OS="$$os" clean; done
-	rm -f os.mk
-
 dist:
 	rm -rf "slstatus-$(VERSION)"
 	mkdir -p "slstatus-$(VERSION)/components"