mirror of
https://github.com/jjsullivan5196/wvkbd.git
synced 2025-08-29 07:12:02 +02:00
Support a layout-specific config.h.
* Rename config.def.h to config.mobintl.h. * config.mobintl.h: * Rename the macro config_def_h_INCLUDED to config_h_INCLUDED. * Remove a tailing space as a refactoring. * Makefile: Add config.h to the clean task. Signed-off-by: Jun Aruga <jun.aruga@gmail.com>
This commit is contained in:
committed by
Maarten van Gompel
parent
b0fd6777fc
commit
49975e78ee
4
Makefile
4
Makefile
@@ -29,7 +29,7 @@ OBJECTS = $(SOURCES:.c=.o)
|
|||||||
all: ${BIN} ${DOCS}
|
all: ${BIN} ${DOCS}
|
||||||
|
|
||||||
config.h:
|
config.h:
|
||||||
cp config.def.h config.h
|
cp config.${LAYOUT}.h config.h
|
||||||
|
|
||||||
proto/%-client-protocol.c: proto/%.xml
|
proto/%-client-protocol.c: proto/%.xml
|
||||||
wayland-scanner code < $? > $@
|
wayland-scanner code < $? > $@
|
||||||
@@ -43,7 +43,7 @@ wvkbd-${LAYOUT}: config.h $(OBJECTS) layout.${LAYOUT}.h
|
|||||||
$(CC) -o wvkbd-${LAYOUT} $(OBJECTS) $(LDFLAGS)
|
$(CC) -o wvkbd-${LAYOUT} $(OBJECTS) $(LDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) ${BIN} ${DOCS}
|
rm -f $(OBJECTS) config.h $(HDRS) $(WAYLAND_SRC) ${BIN} ${DOCS}
|
||||||
|
|
||||||
format:
|
format:
|
||||||
clang-format -i $(WVKBD_SOURCES) $(WVKBD_HEADERS)
|
clang-format -i $(WVKBD_SOURCES) $(WVKBD_HEADERS)
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
#ifndef config_def_h_INCLUDED
|
#ifndef config_h_INCLUDED
|
||||||
#define config_def_h_INCLUDED
|
#define config_h_INCLUDED
|
||||||
|
|
||||||
#define DEFAULT_FONT "Sans 14"
|
#define DEFAULT_FONT "Sans 14"
|
||||||
#define DEFAULT_ROUNDING 5
|
#define DEFAULT_ROUNDING 5
|
||||||
@@ -42,4 +42,4 @@ static enum layout_id landscape_layers[] = {
|
|||||||
NumLayouts // signals the last item, may not be omitted
|
NumLayouts // signals the last item, may not be omitted
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // config_def_h_INCLUDED
|
#endif // config_h_INCLUDED
|
Reference in New Issue
Block a user