Xinqi Bao's Git

Flush the output stream instead of arbitrarily disabling buffering
[slstatus.git] / Makefile
index c68a271..945b5e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,57 +2,49 @@
 # 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)
+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"