diff --git a/Makefile b/Makefile index d5af4ca..5553b3e 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ LDFLAGS = $(LIBS) INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` $(BDLIBS) $(IMLIB2LIBS) -SRC = libs/sl/draw.c spmenu.c libs/sl/main.c +SRC = libs/libdrw/draw.c spmenu.c libs/sl/main.c OBJ = $(SRC:.c=.o) all: options spmenu @@ -28,9 +28,9 @@ options: $(CC) -c $(CFLAGS) -g $< -$(OBJ): options.h libs/sl/draw.h +$(OBJ): options.h libs/libdrw/draw.h -spmenu: spmenu.o libs/sl/draw.o libs/sl/main.o +spmenu: spmenu.o libs/libdrw/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/libdrw/draw.c similarity index 99% rename from libs/sl/draw.c rename to libs/libdrw/draw.c index 6f35634..4a01b3f 100644 --- a/libs/sl/draw.c +++ b/libs/libdrw/draw.c @@ -17,7 +17,7 @@ #endif #include "draw.h" -#include "main.h" +#include "../sl/main.h" #if !USEPANGO #define UTF_INVALID 0xFFFD diff --git a/libs/sl/draw.h b/libs/libdrw/draw.h similarity index 100% rename from libs/sl/draw.h rename to libs/libdrw/draw.h diff --git a/spmenu.c b/spmenu.c index cc3caec..9e26983 100644 --- a/spmenu.c +++ b/spmenu.c @@ -95,7 +95,7 @@ #include "libs/define.c" // various headers -#include "libs/sl/draw.h" +#include "libs/libdrw/draw.h" #include "libs/sl/main.h" #include "libs/draw.h" #include "libs/stream.h"