first status bar updated

[slstatus.git] / Makefile

diff --git a/Makefile b/Makefile
index 505b526..2f93b87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,51 +5,52 @@
 include config.mk
 
 REQ = util
 include config.mk
 
 REQ = util

-HDR = arg.h config.h

 COM =\
 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/battery\
+       components/cpu\
+       components/datetime\
+       components/disk\
+       components/entropy\
+       components/hostname\
+       components/ip\
+       components/kernel_release\
+       components/keyboard_indicators\
+       components/keymap\
+       components/load_avg\
+       components/netspeeds\
+       components/num_files\
+       components/ram\
+       components/run_command\
+       components/separator\
+       components/swap\
+       components/temperature\
+       components/uptime\
+       components/user\
+       components/volume\
+       components/wifi

 
 all: slstatus
 
 
 all: slstatus
 

-slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-slstatus.o: slstatus.c slstatus.h $(HDR) $(REQ:=.h)
-$(COM:=.o): config.mk $(HDR) $(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) -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)
 
 dist:
        rm -rf "slstatus-$(VERSION)"
 
 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 \
        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)"
              slstatus.1 "slstatus-$(VERSION)"
        tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz"
        rm -rf "slstatus-$(VERSION)"