ram: Use POSIX types

[slstatus.git] / Makefile

diff --git a/Makefile b/Makefile
index 85eeaba..945b5e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,11 @@
 # 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/battery\

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


@@ -16,7 +15,9 @@ COM =\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\

+       components/keymap\

        components/load_avg\
        components/load_avg\

+       components/netspeeds\

        components/num_files\
        components/ram\
        components/run_command\
        components/num_files\
        components/ram\
        components/run_command\


@@ -29,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 $(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)