improve performance of case-insensitive matching

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 6b273cb..a03a95c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,64 @@
 # dmenu - dynamic menu
 # dmenu - dynamic menu

-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.

 
 include config.mk
 
 
 include config.mk
 

-SRC = draw.c main.c util.c
-OBJ = ${SRC:.c=.o}
+SRC = drw.c dmenu.c stest.c util.c
+OBJ = $(SRC:.c=.o)

 
 

-all: options dmenu
+all: options dmenu stest

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

-       @echo "CFLAGS   = ${CFLAGS}"
-       @echo "LDFLAGS  = ${LDFLAGS}"
-       @echo "CC       = ${CC}"
+       @echo "CFLAGS   = $(CFLAGS)"
+       @echo "LDFLAGS  = $(LDFLAGS)"
+       @echo "CC       = $(CC)"

 
 .c.o:
 
 .c.o:

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

 
 

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

 
 

-dmenu: ${OBJ}
-       @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
-       @strip $@
+$(OBJ): arg.h config.h config.mk drw.h
+
+dmenu: dmenu.o drw.o util.o
+       $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
+
+stest: stest.o
+       $(CC) -o $@ stest.o $(LDFLAGS)

 
 clean:
 
 clean:

-       @echo cleaning
-       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz

 
 dist: clean
 
 dist: clean

-       @echo creating dist tarball
-       @mkdir -p dmenu-${VERSION}
-       @cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h dmenu_path ${SRC} dmenu-${VERSION}
-       @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
-       @gzip dmenu-${VERSION}.tar
-       @rm -rf dmenu-${VERSION}
+       mkdir -p dmenu-$(VERSION)
+       cp LICENSE Makefile README arg.h config.def.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)

 
 install: all
 
 install: all

-       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
-       @mkdir -p ${DESTDIR}${PREFIX}/bin
-       @cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
-       @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
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       mkdir -p $(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_path
+       chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
+       chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
+       mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+       sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+       sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
+       chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+       chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1

 
 uninstall:
 
 uninstall:

-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
-       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-       @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
+               $(DESTDIR)$(PREFIX)/bin/dmenu_path\
+               $(DESTDIR)$(PREFIX)/bin/dmenu_run\
+               $(DESTDIR)$(PREFIX)/bin/stest\
+               $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
+               $(DESTDIR)$(MANPREFIX)/man1/stest.1

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