Xinqi Bao's Git

projects / slstatus.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Makefile: move OS-specific libs to configure script
[slstatus.git] / Makefile
diff --git a/Makefile b/Makefile
index 5dcef0f..e046597 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,15 @@ COM =\
        components/$(OS)/ram \
        components/run_command\
        components/$(OS)/swap \
        components/$(OS)/ram \
        components/run_command\
        components/$(OS)/swap \
-       components/temperature\
-       components/uptime\
+       components/$(OS)/temperature \
+       components/$(OS)/uptime \
        components/user\
        components/volume\
        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
 
 
 all: slstatus
 
@@ -37,10 +41,10 @@ config.h:
        cp config.def.h $@
 
 .o:
        cp config.def.h $@
 
 .o:
-       $(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS)
+       $(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS)
 
 .c.o:
 
 .c.o:
-       $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $<
+       $(CC) -o $@ -c $(SLSCFLAGS) $<
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)
 
 clean:
        rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o)