--- Makefile.orig	2009-10-17 16:21:44.000000000 -0400
+++ Makefile	2009-10-24 04:30:27.000000000 -0400
@@ -3,17 +3,24 @@
 XROOT     = /usr/X11R6
 CC        = cc
 
-CFLAGS    += -DSHAPE -lXext # comment out this line if you haven't got the x extentions library
+CFLAGS    += -DSHAPE # comment out this line if you haven't got the x extentions library
 #CFLAGS    += -DDEBUG -ggdb3 # -DDEBUG_EVENTS -DSYNC # for debugging
-CFLAGS    += -lX11 -I$(XROOT)/include -L$(XROOT)/lib
+CFLAGS    += -I$(XROOT)/include
+LDFLAGS	  += -lXext -lX11 -L$(XROOT)/lib
+RM	= rm -f
+
+
+SRCFILES := actions.c buttons.c client.c config.c drag.c events.c evn.c \
+	    ewmh.c info.c input.c main.c misc.c vdesk.c wlist.c x11.c 
+OBJFILES := $(SRCFILES:.c=.o) 
 
 all: matwm2
 
-matwm2:
-	$(CC) $(CFLAGS) *.c -o $@
+matwm2: $(OBJFILES)	
+	$(CC) $(LDFLAGS) $(OBJFILES) -o $@
 
 clean:
-	rm -f matwm2
+	$(RM) matwm2 *.o
 
 header:
 	./makeheader *.c > all.h