moved draw.c to libdraw.a

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 2fa60d4..90f178b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,45 @@
 # dmenu - dynamic menu
 # dmenu - dynamic menu

-#   (C)opyright MMVI 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 = dinput.c dmenu.c

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

-all: options dmenu
+all: options dinput dmenu

 
 options:
        @echo dmenu build options:
        @echo "CFLAGS   = ${CFLAGS}"
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 
 options:
        @echo dmenu build options:
        @echo "CFLAGS   = ${CFLAGS}"
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"

-       @echo "LD       = ${LD}"

 
 .c.o:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
 
 .c.o:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 

-${OBJ}: dmenu.h config.h config.mk
+${OBJ}: config.h config.mk draw/libdraw.a

 
 config.h:
 
 config.h:

-       @echo creating $@ from config.default.h
-       @cp config.default.h $@
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@

 
 

-dmenu: ${OBJ}
-       @echo LD $@
-       @${LD} -o $@ ${OBJ} ${LDFLAGS}
-       @strip $@
+.o:
+       @echo CC -o $@
+       @${CC} -o $@ $< ${LDFLAGS}
+
+draw/libdraw.a:
+       @cd draw && make

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning

-       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @cd draw && make clean

 
 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.*.h config.mk \
-               dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+       @cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run draw ${SRC} dmenu-${VERSION}

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


@@ -46,16 +47,20 @@ dist: clean
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

-       @cp -f dmenu ${DESTDIR}${PREFIX}/bin
+       @cp -f dinput dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dinput

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

+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run

        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @echo installing manual page to ${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

        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin

-       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
+       @rm -f ${DESTDIR}${PREFIX}/bin/dinput ${DESTDIR}${PREFIX}/bin/dmenu_run

        @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