move main.c and main.h to libs/sl as well
This commit is contained in:
parent
e012696695
commit
abb80ed8af
4
Makefile
4
Makefile
|
@ -6,7 +6,7 @@ include options.mk
|
||||||
include host.mk
|
include host.mk
|
||||||
include toggle.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)
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
all: options spmenu
|
all: options spmenu
|
||||||
|
@ -23,7 +23,7 @@ options:
|
||||||
|
|
||||||
$(OBJ): options.h options.mk libs/sl/draw.h
|
$(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)
|
$(CC) -o $@ spmenu.o draw.o main.o $(LDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <pango/pangoxft.h>
|
#include <pango/pangoxft.h>
|
||||||
|
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "../../main.h"
|
#include "main.h"
|
||||||
|
|
||||||
Drw *
|
Drw *
|
||||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
||||||
|
|
2
spmenu.c
2
spmenu.c
|
@ -80,7 +80,7 @@
|
||||||
#include <pango/pango.h>
|
#include <pango/pango.h>
|
||||||
|
|
||||||
#include "libs/sl/draw.h"
|
#include "libs/sl/draw.h"
|
||||||
#include "main.h"
|
#include "libs/sl/main.h"
|
||||||
|
|
||||||
/* macros */
|
/* macros */
|
||||||
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
|
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
|
||||||
|
|
Loading…
Reference in a new issue