diff --git a/Makefile b/Makefile index db17991..468fdef 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ OBJECTS = $(SOURCES:.c=.o) all: ${BIN} ${DOCS} config.h: - cp config.def.h config.h + cp config.${LAYOUT}.h config.h proto/%-client-protocol.c: proto/%.xml wayland-scanner code < $? > $@ @@ -43,7 +43,7 @@ wvkbd-${LAYOUT}: config.h $(OBJECTS) layout.${LAYOUT}.h $(CC) -o wvkbd-${LAYOUT} $(OBJECTS) $(LDFLAGS) clean: - rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) ${BIN} ${DOCS} + rm -f $(OBJECTS) config.h $(HDRS) $(WAYLAND_SRC) ${BIN} ${DOCS} format: clang-format -i $(WVKBD_SOURCES) $(WVKBD_HEADERS) diff --git a/config.def.h b/config.mobintl.h similarity index 91% rename from config.def.h rename to config.mobintl.h index 190c56f..74dd9ce 100644 --- a/config.def.h +++ b/config.mobintl.h @@ -1,5 +1,5 @@ -#ifndef config_def_h_INCLUDED -#define config_def_h_INCLUDED +#ifndef config_h_INCLUDED +#define config_h_INCLUDED #define DEFAULT_FONT "Sans 14" #define DEFAULT_ROUNDING 5 @@ -31,7 +31,7 @@ struct clr_scheme schemes[] = { /* layers is an ordered list of layouts, used to cycle through */ static enum layout_id layers[] = { Full, // First layout is the default layout on startup - Special, + Special, NumLayouts // signals the last item, may not be omitted }; @@ -42,4 +42,4 @@ static enum layout_id landscape_layers[] = { NumLayouts // signals the last item, may not be omitted }; -#endif // config_def_h_INCLUDED +#endif // config_h_INCLUDED