4061bacc1d235591c553bb1ba8a0d8b116a12b4b — Max Schillinger 1 year, 2 months ago 0f07238
create layout-dependent object files

When you build svkbd with different layouts, you get one binary per
layout but all binaries are identical:

    $ make LAYOUT=mobile-plain
    $ make LAYOUT=mobile-simple
    $ diff -s svkbd-mobile-plain svkbd-mobile-simple
    Files svkbd-mobile-plain and svkbd-mobile-simple are identical

The problem is that svkbd.o from the first build is being reused in the
second build.

This commit changes the Makefile to create layout-dependent object files
like svkbd-mobile-plain.o and svkbd-mobile-simple.o (instead of a shared
1 files changed, 4 insertions(+), 3 deletions(-)

M Makefile
M Makefile => Makefile +4 -3
@@ 9,7 9,7 @@ include config.mk

SRC = drw.c ${NAME}.c util.c
OBJ = ${SRC:.c=.o}
OBJ = drw.o ${NAME}-${LAYOUT}.o util.o
MAN1 = ${NAME}.1

all: ${BIN}

@@ 24,7 24,8 @@ options:
	cp config.def.h $@

svkbd.o: config.h layout.${LAYOUT}.h
svkbd-${LAYOUT}.o: config.h layout.${LAYOUT}.h
	${CC} ${SVKBD_CFLAGS} ${SVKBD_CPPFLAGS} -c svkbd.c -o $@


@@ 35,7 36,7 @@ ${BIN}: ${OBJ}
	${CC} -o ${BIN} ${OBJ} ${SVKBD_LDFLAGS}

	rm -f ${NAME}-?? ${NAME}-??.o ${OBJ} ${BIN}
	rm -f ${NAME}-?? ${NAME}-*.o ${OBJ} ${BIN}

	rm -rf "${NAME}-${VERSION}"