Xinqi Bao's Git

projects / slstatus.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
components/swap.c | move duplicated code to separate function
[slstatus.git] / Makefile
diff --git a/Makefile b/Makefile
index a2c49c8..00c35c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,34 +2,29 @@
 # 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/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/load_avg\
        components/num_files\
        components/hostname\
        components/ip\
        components/kernel_release\
        components/keyboard_indicators\
        components/load_avg\
        components/num_files\
-       components/$(OS)/ram \
+       components/ram\
        components/run_command\
        components/run_command\
-       components/$(OS)/swap \
-       components/$(OS)/temperature \
-       components/$(OS)/uptime \
+       components/swap\
+       components/temperature\
+       components/uptime\
        components/user\
        components/volume\
        components/user\
        components/volume\
-       components/$(OS)/wifi
-
-SLSCFLAGS  = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
-SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
-SLSLIBS    = -lX11 $(OSSLIBS) $(LIBS)
+       components/wifi
 
 all: slstatus
 
 
 all: slstatus
 
@@ -41,10 +36,10 @@ config.h:
        cp config.def.h $@
 
 .o:
        cp config.def.h $@
 
 .o:
-       $(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
+       $(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
 
 .c.o:
 
 .c.o:
-       $(CC) -o $@ -c $(SLSCFLAGS) $<
+       $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)