Xinqi Bao's Git

battery: OS split
[slstatus.git] / Makefile
index d657981..85eeaba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,55 +2,36 @@
 # slstatus - suckless status monitor
 .POSIX:
 
+include os.mk
 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/$(OS)/battery \
+       components/cpu\
+       components/datetime\
+       components/disk\
+       components/entropy\
+       components/hostname\
+       components/ip\
+       components/kernel_release\
+       components/keyboard_indicators\
+       components/load_avg\
+       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)
-
-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)
+slstatus.o: slstatus.c slstatus.h arg.h config.h $(REQ:=.h)
+$(COM:=.o): config.mk $(REQ:=.h)
 
 config.h:
        cp config.def.h $@
@@ -59,16 +40,16 @@ config.h:
        $(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
 
 .c.o:
-       $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+       $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 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)"