--- Makefile.old	2009-07-02 20:16:52.561919791 +0200
+++ Makefile	2009-07-02 20:17:21.947666469 +0200
@@ -4,19 +4,19 @@ DESTDIR=/
 CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
 
 DEBUG=-g # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
+LIBS+=-lpanel -lncurses -lutil -lm
 # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
+CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -rdynamic
 
 OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
 
 all: multitail
 
 multitail: $(OBJS)
-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 multitail_ccmalloc: $(OBJS)
-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
+	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS)  $(OBJS) -o ccmultitail $(LIBS)
 
 install: multitail
 	cp multitail $(DESTDIR)/usr/bin