Fix x coordinate calculation in buttonpress.

[dwm.git] / Makefile

diff --git a/Makefile b/Makefile
index f8c394a..77bcbc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,12 @@
 # dwm - dynamic window manager
 # dwm - dynamic window manager

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

 
 include config.mk
 
 
 include config.mk
 

-SRC = client.c draw.c event.c main.c tag.c util.c
+SRC = drw.c dwm.c util.c

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

-MAN1 = dwm.1 
-BIN = dwm

 
 all: options dwm
 
 all: options dwm

-       @echo finished

 
 options:
        @echo dwm build options:
 
 options:
        @echo dwm build options:


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

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

 
 

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

 
 config.h:
 
 config.h:

-       @echo missing config.h created
-       @cp config.default.h $@
+       cp config.def.h $@

 
 dwm: ${OBJ}
 
 dwm: ${OBJ}

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

 
 clean:
 
 clean:

-       rm -f dwm *.o dwm-${VERSION}.tar.gz
+       rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz

 
 dist: clean
        mkdir -p dwm-${VERSION}
 
 dist: clean
        mkdir -p dwm-${VERSION}

-       cp -R Makefile README LICENSE config.mk dwm.h config.*.h \
-               ${SRC} ${MAN1} dwm-${VERSION}
+       cp -R LICENSE Makefile README config.def.h config.mk\
+               dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}

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

-       @mkdir -p ${DESTDIR}${PREFIX}/bin
-       @cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
-       @for i in ${BIN}; do \
-               chmod 755 ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-       done
-       @echo installed executable files to ${DESTDIR}${PREFIX}/bin
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
-       @for i in ${MAN1}; do \
-               chmod 444 ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-       done
-       @echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
+       mkdir -p ${DESTDIR}${PREFIX}/bin
+       cp -f dwm ${DESTDIR}${PREFIX}/bin
+       chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
+       mkdir -p ${DESTDIR}${MANPREFIX}/man1
+       sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+       chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1

 
 uninstall:
 
 uninstall:

-       for i in ${BIN}; do \
-               rm -f ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-       done
-       for i in ${MAN1}; do \
-               rm -f ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-       done
+       rm -f ${DESTDIR}${PREFIX}/bin/dwm\
+               ${DESTDIR}${MANPREFIX}/man1/dwm.1

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