Merge pull request #9 from stevenhoneyman/master

Makefile improvements & compiler warnings fixed

main.cpp

@@ -85,7 +85,7 @@ int main( int argc, char** argv ) {
         double timei = double( time.tv_sec*1000000000L + time.tv_nsec )/1000000000.f;
         double starti = double( start.tv_sec*1000000000L + start.tv_nsec )/1000000000.f;
         if ( timei - starti > options->m_gracetime ) {
-            if ( xengine->anyKeyPressed() && keyboard || xengine->mouseDown( 3 ) ) {
+            if ( ( xengine->anyKeyPressed() && keyboard ) || xengine->mouseDown( 3 ) ) {
                 printSelection( true, 0, 0, 0, 0 );
                 fprintf( stderr, "User pressed key. Canceled selection.\n" );
                 state = -1;

makefile

@@ -1,22 +1,23 @@
-CC=g++
-CCFLAGS=-O2 -g
-LDFLAGS=-lX11 -lXext -lrt
-SOURCES=main.cpp x.cpp options.cpp rectangle.cpp
-OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=slop
-BINDIR="/usr/bin"
+CXX ?= g++
+CXXFLAGS ?= -O2 -g
+LDFLAGS += -lX11 -lXext -lrt
+SOURCES = main.cpp x.cpp options.cpp rectangle.cpp
+OBJECTS = $(SOURCES:.cpp=.o)
+EXECUTABLE = slop
+BINDIR = "/usr/bin"
 
-all: $(SOURCES) $(EXECUTABLE)
+all: $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
-	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
-
-$(OBJECTS): %.o: %.cpp
-	$(CC) $(CCFLAGS) -o $@ -c $<
+	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
 
 clean:
-	rm -rf $(OBJECTS) $(EXECUTABLE)
+	$(RM) $(OBJECTS)
+
+dist-clean: clean
+	$(RM) $(EXECUTABLE)
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
 	cp $(CURDIR)/$(EXECUTABLE) $(DESTDIR)$(BINDIR)
+

x.cpp

@@ -13,7 +13,7 @@ int slop::XEngineErrorHandler( Display* dpy, XErrorEvent* event ) {
     char buffer[1024];
     XGetErrorText( dpy, event->error_code, buffer, 1024 );
     fprintf( stderr,
-             "_X Error of failed request:  %s\n_  Major opcode of failed request: % 3d\n_  Serial number of failed request:% 5d\n_  Current serial number in output stream:?????\n",
+             "_X Error of failed request:  %s\n_  Major opcode of failed request: % 3d\n_  Serial number of failed request:% 5li\n_  Current serial number in output stream:?????\n",
              buffer,
              event->request_code,
              event->serial );