diff --git a/Makefile b/Makefile index 05ec065..c82d01a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ include options.mk include host.mk include toggle.mk -SRC = libs/sl/draw.c spmenu.c main.c +SRC = libs/sl/draw.c spmenu.c libs/sl/main.c OBJ = $(SRC:.c=.o) all: options spmenu @@ -23,7 +23,7 @@ options: $(OBJ): options.h options.mk libs/sl/draw.h -spmenu: spmenu.o libs/sl/draw.o main.o +spmenu: spmenu.o libs/sl/draw.o libs/sl/main.o $(CC) -o $@ spmenu.o draw.o main.o $(LDFLAGS) clean: diff --git a/libs/sl/draw.c b/libs/sl/draw.c index 40ad9e6..e80bf50 100644 --- a/libs/sl/draw.c +++ b/libs/sl/draw.c @@ -8,7 +8,7 @@ #include #include "draw.h" -#include "../../main.h" +#include "main.h" Drw * drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) diff --git a/main.c b/libs/sl/main.c similarity index 100% rename from main.c rename to libs/sl/main.c diff --git a/main.h b/libs/sl/main.h similarity index 100% rename from main.h rename to libs/sl/main.h diff --git a/spmenu.c b/spmenu.c index cd7a63d..510f2c9 100644 --- a/spmenu.c +++ b/spmenu.c @@ -80,7 +80,7 @@ #include #include "libs/sl/draw.h" -#include "main.h" +#include "libs/sl/main.h" /* macros */ #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))