ordered switch branches in kpress alphabetically, applied Sanders patch for PgUp...

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index d170037..d208dbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,27 +7,23 @@ SRC = draw.c main.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu

-       @echo finished

 
 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.h:
-       @echo creating $@ from config.default.h
-       @cp config.default.h $@
+${OBJ}: dmenu.h config.mk

 
 dmenu: ${OBJ}
        @echo LD $@
 
 dmenu: ${OBJ}
        @echo LD $@

-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+       @${LD} -o $@ ${OBJ} ${LDFLAGS}

        @strip $@
 
 clean:
        @strip $@
 
 clean:


@@ -37,8 +33,7 @@ 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 dmenu.h ${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}