Xinqi Bao's Git

projects / slstatus.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
battery: 64 bit ints on Linux
[slstatus.git] / Makefile
diff --git a/Makefile b/Makefile
index 8e18969..945b5e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ include config.mk
 
 REQ = util
 COM =\
 
 REQ = util
 COM =\
-       components/backlight\
        components/battery\
        components/cpu\
        components/datetime\
        components/battery\
        components/cpu\
        components/datetime\
@@ -16,6 +15,7 @@ COM =\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\
+       components/keymap\
        components/load_avg\
        components/netspeeds\
        components/num_files\
        components/load_avg\
        components/netspeeds\
        components/num_files\
@@ -30,18 +30,17 @@ COM =\
 
 all: slstatus
 
 
 all: slstatus
 
-slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)
 $(COM:=.o): config.mk $(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 $@
 
 
 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)
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)