diff -ur obpager-1.8.orig/Makefile obpager-1.8/Makefile --- obpager-1.8.orig/Makefile 2004-09-01 17:23:44 +0300 +++ obpager-1.8/Makefile 2006-03-31 12:38:22 +0300 @@ -15,9 +15,9 @@ CDEFS = -D_REENTRANT CPPFLAGS = -ggdb -Wall #CPPFLAGS = -ggdb -Wall -O2 -INCLUDES = -I/usr/X11R6/include/X11 -I/usr/X11R6/include/X11/extensions -I./src +INCLUDES = -I/usr/include/X11 -I/usr/include/X11/extensions -I./src COMPILE = $(CXX) $(CDEFS) $(INCLUDES) $(CPPFLAGS) -LINK = $(CXX) $(LDFLAGS) $(LDLIBS) +LINK = $(CXX) LDLIBS = -L/usr/X11R6/lib -lX11 -lXext @@ -45,11 +45,11 @@ # This is the main target, really $(EXECUTABLE): $(OBJS) - @echo "Linking "$@ ;\ - $(LINK) -o $(EXECUTABLE) $(OBJS) + echo "Linking "$@ ;\ + $(LINK) -o $(EXECUTABLE) $(OBJS) $(LDFLAGS) $(LDLIBS) install: - @echo "Installing obpager...." ;\ + echo "Installing obpager...." ;\ install $(EXECUTABLE) $(INSTALLDIR) @@ -84,9 +84,11 @@ # commands or prerequisites). $(OBJDIR)/%.o : %.cc - @echo "Compiling "$< ;\ - mkdir $(OBJDIR) 2>/dev/null ; mkdir $(OBJDIR)/src 2>/dev/null ; \ - mkdir $(DEPDIR) 2>/dev/null ; mkdir $(DEPDIR)/src 2>/dev/null ; \ + echo "Compiling "$< ;\ + mkdir -p $(OBJDIR) + mkdir -p $(OBJDIR)/src + mkdir -p $(DEPDIR) + mkdir -p $(DEPDIR)/src $(COMPILE) -MMD -o $@ -c $< ; \ cp $(OBJDIR)/$*.d $(DEPDIR)/$*.d ; \ sed -s -e 's/^[^:]\+: *//' -e 's/ *\\$$//' -e 's/^ *//' -e 's/ \+/ :\n/g' -e 's/$$/ :/' < $(OBJDIR)/$*.d >> $(DEPDIR)/$*.d ; \ @@ -101,7 +103,7 @@ # Clean up the object code and deps and executable clean: - @for i in $(DEPS) $(OBJS) $(EXECUTABLE) ; \ + for i in $(DEPS) $(OBJS) $(EXECUTABLE) ; \ do \ if [ -e $$i ] ; then \ echo "Deleting "$$i ; \ diff -ur obpager-1.8.orig/src/main.cc obpager-1.8/src/main.cc --- obpager-1.8.orig/src/main.cc 2004-09-01 17:23:44 +0300 +++ obpager-1.8/src/main.cc 2006-03-31 12:38:13 +0300 @@ -33,7 +33,7 @@ #include "OBPager.h" #include "VerboseException.h" - +#include // As usual in a C++ app, main is pretty small (okay-- it was until I started parsing the args by hand and forking subprocesses)