merge token -> default

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index d86c111..1135d65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # dmenu - dynamic menu
 # dmenu - dynamic menu

-#   (C)opyright MMVII Anselm R. Garbe
+# See LICENSE file for copyright and license details.

 
 include config.mk
 
 
 include config.mk
 

-SRC = draw.c main.c util.c
+SRC = dmenu.c draw.c lsx.c

 OBJ = ${SRC:.c=.o}
 
 OBJ = ${SRC:.c=.o}
 

-all: options dmenu
+all: options dmenu lsx

 
 options:
        @echo dmenu build options:
 
 options:
        @echo dmenu build options:


@@ -15,42 +15,52 @@ options:
        @echo "CC       = ${CC}"
 
 .c.o:
        @echo "CC       = ${CC}"
 
 .c.o:

-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+       @echo CC -c $<
+       @${CC} -c $< ${CFLAGS}

 
 

-${OBJ}: dmenu.h config.mk
+${OBJ}: config.mk

 
 

-dmenu: ${OBJ}
+dmenu: dmenu.o draw.o

        @echo CC -o $@
        @echo CC -o $@

-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
-       @strip $@
+       @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+
+lsx: lsx.o
+       @echo CC -o $@
+       @${CC} -o $@ lsx.o ${LDFLAGS}

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning

-       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @rm -f dmenu lsx ${OBJ} dmenu-${VERSION}.tar.gz

 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

-       @cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+       @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run lsx.1 ${SRC} dmenu-${VERSION}

        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
 
 install: all
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
 
 install: all

-       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+       @echo installing executables to ${DESTDIR}${PREFIX}/bin

        @mkdir -p ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

-       @cp -f dmenu ${DESTDIR}${PREFIX}/bin
+       @cp -f dmenu dmenu_run lsx ${DESTDIR}${PREFIX}/bin

        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu

-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/lsx
+       @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1

        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1

-       @sed 's/VERSION/${VERSION}/g' < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       @sed "s/VERSION/${VERSION}/g" < lsx.1 > ${DESTDIR}${MANPREFIX}/man1/lsx.1

        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1

+       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/lsx.1

 
 uninstall:
 
 uninstall:

-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+       @echo removing executables from ${DESTDIR}${PREFIX}/bin

        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu

+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
+       @rm -f ${DESTDIR}${PREFIX}/bin/lsx

        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1

+       @rm -f ${DESTDIR}${MANPREFIX}/man1/lsx.1

 
 .PHONY: all options clean dist install uninstall
 
 .PHONY: all options clean dist install uninstall