Refactor keymap.c

[slstatus.git] / Makefile

diff --git a/Makefile b/Makefile
index 99d10c5..7ed7099 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,25 @@
 # slstatus - suckless status monitor
 .POSIX:
 
 # slstatus - suckless status monitor
 .POSIX:
 

-include os.mk

 include config.mk
 
 REQ = util
 COM =\
 include config.mk
 
 REQ = util
 COM =\

-       components/$(OS)/battery \
-       components/$(OS)/cpu \
+       components/backlight\
+       components/battery\
+       components/cpu\

        components/datetime\
        components/disk\
        components/datetime\
        components/disk\

-       components/$(OS)/entropy \
+       components/entropy\

        components/hostname\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\
        components/hostname\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\

+       components/keymap\

        components/load_avg\
        components/load_avg\

+       components/netspeeds\

        components/num_files\
        components/num_files\

-       components/$(OS)/ram \
+       components/ram\

        components/run_command\
        components/swap\
        components/temperature\
        components/run_command\
        components/swap\
        components/temperature\


@@ -30,7 +32,7 @@ COM =\
 all: slstatus
 
 slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
 all: slstatus
 
 slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)

-slstatus.o: slstatus.c slstatus.h arg.h config.h $(REQ:=.h)
+slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)

 $(COM:=.o): config.mk $(REQ:=.h)
 
 config.h:
 $(COM:=.o): config.mk $(REQ:=.h)
 
 config.h: