--- Makefile.org	2005-09-30 19:04:43.000000000 +0200
+++ Makefile	2005-09-30 19:06:45.000000000 +0200
@@ -5,9 +5,8 @@
 #######################################################
 CXX=/usr/bin/g++
 CC=/usr/bin/gcc
-CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-CXXLAGS=$(CFLAGS)
-LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
+INCLUDES=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+MYLDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
 PREFIX=/usr
 CFGDIR=/etc
@@ -26,13 +25,13 @@
 all: slim
 
 slim: $(OBJECTS)
-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
+	$(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OBJECTS) -o $(NAME)
 
 .cpp.o:
-	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
+	$(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 install: slim install-theme
 	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim