simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / Makefile

diff --git a/Makefile b/Makefile
index fff5ee1..223f6f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,21 +3,59 @@
 
 include config.mk
 
 
 include config.mk
 

-SRC      = wm.c
-OBJ      = ${SRC:.c=.o}
+WMSRC = bar.c client.c cmd.c draw.c event.c kb.c mouse.c util.c wm.c
+WMOBJ = ${WMSRC:.c=.o}
+MENSRC = menu.c draw.c util.c
+MENOBJ = ${MENSRC:.c=.o}
+MAN1 = gridwm.1 gridmenu.1
+BIN = gridwm gridmenu

 
 

-all: gridwm
+all: config gridwm gridmenu

        @echo finished
 
        @echo finished
 

+config:
+       @echo gridwm build options:
+       @echo "LIBS     = ${LIBS}"
+       @echo "CFLAGS   = ${CFLAGS}"
+       @echo "LDFLAGS  = ${LDFLAGS}"
+       @echo "CC       = ${CC}"
+

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

-${OBJ}: wm.h
+${WMOBJ}: wm.h draw.h config.h util.h
+
+gridmenu: ${MENOBJ}
+       @echo LD $@
+       @${CC} -o $@ ${MENOBJ} ${LDFLAGS}

 
 

-gridwm: ${OBJ}
+gridwm: ${WMOBJ}

        @echo LD $@
        @echo LD $@

-       @${CC} -o $@ ${OBJ} ${X11LDFLAGS}
+       @${CC} -o $@ ${WMOBJ} ${LDFLAGS}

 
 clean:
 
 clean:

-       rm -f gridwm *.o
+       rm -f gridwm gridmenu *.o core
+
+dist: clean
+       mkdir -p gridwm-${VERSION}
+       cp -R Makefile README LICENSE config.mk *.h *.c ${MAN} gridwm-${VERSION}
+       tar -cf gridwm-${VERSION}.tar gridwm-${VERSION}
+       gzip gridwm-${VERSION}.tar
+       rm -rf gridwm-${VERSION}
+
+install: all
+       @mkdir -p ${DESTDIR}${PREFIX}/bin
+       @cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
+       @echo installed executable files to ${DESTDIR}${PREFIX}/bin
+       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+       @cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
+       @echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
+
+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