X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/92ab9ef52ebcb097add97d9f78e67ad1c1d6a6ec..2ea3d46f1341716daa1370f0f19d1fc571c3e63a:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 871f09d..e046597 100644
--- a/Makefile
+++ b/Makefile
@@ -7,25 +7,29 @@ include config.mk
 
 REQ = util
 COM =\
-	components/battery\
-	components/cpu\
+	components/$(OS)/battery \
+	components/$(OS)/cpu \
 	components/datetime\
 	components/disk\
-	components/entropy\
+	components/$(OS)/entropy \
 	components/hostname\
 	components/ip\
 	components/kernel_release\
 	components/keyboard_indicators\
 	components/load_avg\
 	components/num_files\
-	components/ram\
+	components/$(OS)/ram \
 	components/run_command\
-	components/swap\
-	components/temperature\
-	components/uptime\
+	components/$(OS)/swap \
+	components/$(OS)/temperature \
+	components/$(OS)/uptime \
 	components/user\
 	components/volume\
-	components/wifi
+	components/$(OS)/wifi
+
+SLSCFLAGS  = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
+SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
+SLSLIBS    = -lX11 $(OSLIBS) $(LIBS)
 
 all: slstatus
 
@@ -37,10 +41,10 @@ config.h:
 	cp config.def.h $@
 
 .o:
-	$(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
+	$(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
 
 .c.o:
-	$(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
+	$(CC) -o $@ -c $(SLSCFLAGS) $<
 
 clean:
 	rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)