drw: simplify drw_font_xcreate and prevent a potential unneeded allocation

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index c127f6a..8f14a8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
 
 include config.mk
 

-SRC = dmenu.c draw.c stest.c
+SRC = drw.c dmenu.c stest.c util.c

 OBJ = ${SRC:.c=.o}
 
 all: options dmenu stest
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu stest


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

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

 
 

-${OBJ}: config.mk draw.h
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@

 
 

-dmenu: dmenu.o draw.o
+${OBJ}: arg.h config.h config.mk drw.h
+
+dmenu: dmenu.o drw.o util.o

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

-       @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+       @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}

 
 stest: stest.o
        @echo CC -o $@
 
 stest: stest.o
        @echo CC -o $@


@@ -35,7 +39,8 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

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


@@ -43,8 +48,9 @@ dist: clean
 install: all
        @echo installing executables to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
 install: all
        @echo installing executables to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

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

        @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
        @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
        @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
        @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
        @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1


@@ -57,6 +63,7 @@ install: all
 uninstall:
        @echo removing executables from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
 uninstall:
        @echo removing executables from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu

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

        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
        @rm -f ${DESTDIR}${PREFIX}/bin/stest
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
        @rm -f ${DESTDIR}${PREFIX}/bin/stest
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1