diff options
-rw-r--r-- | Makefile | 53 | ||||
-rw-r--r-- | config.def.h | 2 | ||||
-rw-r--r-- | config.mk | 8 |
3 files changed, 24 insertions, 39 deletions
diff --git a/Makefile b/Makefile index 1b95d15..0069372 100644 --- a/Makefile +++ b/Makefile @@ -16,50 +16,41 @@ options: @echo "CC = ${CC}" .c.o: - @echo CC $< - @${CC} -c ${CFLAGS} $< + ${CC} -c ${CFLAGS} $< ${OBJ}: config.h config.mk config.h: - @echo creating $@ from config.def.h - @cp config.def.h $@ + cp config.def.h $@ .o: - @echo CC -o $@ - @${CC} -o $@ $< ${LDFLAGS} + ${CC} -o $@ $< ${LDFLAGS} clean: - @echo cleaning - @rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz + rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz dist: clean - @echo creating dist tarball - @mkdir -p tabbed-${VERSION} - @cp -R LICENSE Makefile README config.def.h config.mk \ - tabbed.1 arg.h ${SRC} tabbed-${VERSION} - @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} - @gzip tabbed-${VERSION}.tar - @rm -rf tabbed-${VERSION} + mkdir -p tabbed-${VERSION} + cp -R LICENSE Makefile README config.def.h config.mk \ + tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} + tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} + gzip tabbed-${VERSION}.tar + rm -rf tabbed-${VERSION} install: all - @echo installing executable files to ${DESTDIR}${PREFIX}/bin - @mkdir -p "${DESTDIR}${PREFIX}/bin" - @cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" - @chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" - @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p "${DESTDIR}${MANPREFIX}/man1" - @sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" + mkdir -p "${DESTDIR}${PREFIX}/bin" + cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" + chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" + mkdir -p "${DESTDIR}${MANPREFIX}/man1" + sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" uninstall: - @echo removing executable files from ${DESTDIR}${PREFIX}/bin - @rm -f "${DESTDIR}${PREFIX}/bin/tabbed" - @rm -f "${DESTDIR}${PREFIX}/bin/xembed" - @echo removing manual pages from ${DESTDIR}${MANPREFIX}/man1 - @rm -f "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @rm -f "${DESTDIR}${MANPREFIX}/man1/xembed.1" + rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\ + "${DESTDIR}${PREFIX}/bin/xembed"\ + "${DESTDIR}${MANPREFIX}/man1/tabbed.1"\ + "${DESTDIR}${MANPREFIX}/man1/xembed.1" .PHONY: all options clean dist install uninstall diff --git a/config.def.h b/config.def.h index defa426..51bb13d 100644 --- a/config.def.h +++ b/config.def.h @@ -34,7 +34,7 @@ static Bool npisrelative = False; } #define MODKEY ControlMask -static Key keys[] = { +static const Key keys[] = { /* modifier key function argument */ { MODKEY|ShiftMask, XK_Return, focusonce, { 0 } }, { MODKEY|ShiftMask, XK_Return, spawn, { 0 } }, diff --git a/config.mk b/config.mk index 590a937..d8174ac 100644 --- a/config.mk +++ b/config.mk @@ -1,7 +1,5 @@ # tabbed version -VERSION = 0.6 - -# Customize below to fit your system +VERSION = 0.7 # paths PREFIX = /usr/local @@ -25,9 +23,5 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} -# Solaris -#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" -#LDFLAGS = ${LIBS} - # compiler and linker CC = cc |