Cleanup

Cleaning dirctory structures and the README

.gitignore

@@ -19,3 +19,4 @@
 *.exe
 *.out
 *.app
+osmpng

Makefile

@@ -1,6 +1,4 @@
 CXX=g++
-#CXX_FLAGS=-Wall -pedantic -std=c++11
-# Use this CXX_FLAGS if gcc < 4.7
 CXX_FLAGS=-Wall -Wextra -Werror -pedantic -std=c++11
 
 
@@ -8,17 +6,14 @@ default:	all
 all:	osmpng
 
 
-osmpng: src/osmpng.cpp src/String.hpp String
-	$(CXX) $(CXX_FLAGS) `libpng-config --cflags` `curl-config --cflags` -o bin/osmpng src/osmpng.cpp bin/String.o `libpng-config --ldflags` `curl-config --libs`
-
-String:	src/String.hpp src/String.cpp
-	mkdir -p bin
-	$(CXX) $(CXX_FLAGS) -c -o bin/String.o src/String.cpp
+osmpng: osmpng.cpp String.o
+	$(CXX) $(CXX_FLAGS) `libpng-config --cflags` `curl-config --cflags` -o $@ $^ `libpng-config --ldflags` `curl-config --libs`
 
+String.o: String.cpp String.hpp
+	$(CXX) $(CXX_FLAGS) -c -o $@ $^
 
 clean:
-	rm -f bin/*.o
-	rm -f bin/*.f
+	rm -f *.o
 
 install:	osmpng
-	install bin/osmpng /usr/local/bin/osmpng
+	install osmpng /usr/local/bin/osmpng

README.md

@@ -1,30 +1,25 @@
-osmpng
-======
+# osmpng
 
 OSM Title downloader and merger tool
 
 
-Compile
-=======
+## Build
 
-osmpng depends on libpng++ and libcurl. You will need both libraries to complete the compile process.
-To compile just run
+osmpng depends on `libpng++` and `libcurl`. You will need both libraries to complete the compile process.
 
-make && sudo make install
+    make
+    sudo make install
 
-Usage
-=====
+## Usage
 
-Type osmpng --help if you need help.
+Type `osmpng --help` for a helpful help message :-)
 
-To download for instance the map of Innsbruck: osmpng -o ibk.png 11.3425-11.4614 47.2761-47.2484 14
 
-Screenshot
-==========
+### Demo 
 
-![alt tag](http://www.feldspaten.org/wp-content/uploads/2014/04/osmpng.png)
+To download for instance the map of Innsbruck
 
-Running
-=======
+    osmpng -o ibk.png 11.3425-11.4614 47.2761-47.2484 14
+
+![Screenshot of Innsbruck](osmpng.png)
 
-osmpng -version