X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/72f5a0d69ad43e7329064f415b4f8df3c1c2ccec..2ea3d46f1341716daa1370f0f19d1fc571c3e63a:/Makefile diff --git a/Makefile b/Makefile index 5dcef0f..e046597 100644 --- a/Makefile +++ b/Makefile @@ -21,11 +21,15 @@ COM =\ components/$(OS)/ram \ components/run_command\ components/$(OS)/swap \ - components/temperature\ - components/uptime\ + 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)