diff --git a/samples/Makefile b/samples/Makefile
deleted file mode 100644
index 9e49b272..00000000
--- a/samples/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-export CC       = g++
-export CFLAGS   = -W -Wall -ansi -g -O2 -DNDEBUG -I../../include
-export LDFLAGS  = 
-export EXECPATH = ../bin
-
-all: ftp-sample opengl-sample pong-sample qt-sample shader-sample sockets-sample sound-sample sound_capture-sample voip-sample window-sample wxwidgets-sample X11-sample
-
-ftp-sample:
-	@(mkdir -p bin)
-	@(cd ./ftp && $(MAKE))
-
-opengl-sample:
-	@(mkdir -p bin)
-	@(cd ./opengl && $(MAKE))
-
-pong-sample:
-	@(mkdir -p bin)
-	@(cd ./pong && $(MAKE))
-
-shader-sample:
-	@(mkdir -p bin)
-	@(cd ./shader && $(MAKE))
-
-qt-sample:
-	@(mkdir -p bin)
-	@(cd ./qt && $(MAKE))
-
-sockets-sample:
-	@(mkdir -p bin)
-	@(cd ./sockets && $(MAKE))
-
-sound-sample:
-	@(mkdir -p bin)
-	@(cd ./sound && $(MAKE))
-
-sound_capture-sample:
-	@(mkdir -p bin)
-	@(cd ./sound_capture && $(MAKE))
-
-voip-sample:
-	@(mkdir -p bin)
-	@(cd ./voip && $(MAKE))
-
-window-sample:
-	@(mkdir -p bin)
-	@(cd ./window && $(MAKE))
-
-wxwidgets-sample:
-	@(mkdir -p bin)
-	@(cd ./wxwidgets && $(MAKE))
-
-X11-sample:
-	@(mkdir -p bin)
-	@(cd ./X11 && $(MAKE))
-
-.PHONY: clean mrproper
-
-clean:
-	@(cd  ./ftp           && $(MAKE) $@ && \
-	  cd ../opengl        && $(MAKE) $@ && \
-	  cd ../pong          && $(MAKE) $@ && \
-	  cd ../qt            && $(MAKE) $@ && \
-	  cd ../shader        && $(MAKE) $@ && \
-	  cd ../sockets       && $(MAKE) $@ && \
-	  cd ../sound         && $(MAKE) $@ && \
-	  cd ../sound_capture && $(MAKE) $@ && \
-	  cd ../voip          && $(MAKE) $@ && \
-	  cd ../window        && $(MAKE) $@ && \
-	  cd ../wxwidgets     && $(MAKE) $@ && \
-	  cd ../X11           && $(MAKE) $@)
-
-mrproper: clean
-	@(cd  ./ftp           && $(MAKE) $@ && \
-	  cd ../opengl        && $(MAKE) $@ && \
-	  cd ../pong          && $(MAKE) $@ && \
-	  cd ../qt            && $(MAKE) $@ && \
-	  cd ../shader        && $(MAKE) $@ && \
-	  cd ../sockets       && $(MAKE) $@ && \
-	  cd ../sound         && $(MAKE) $@ && \
-	  cd ../sound_capture && $(MAKE) $@ && \
-	  cd ../voip          && $(MAKE) $@ && \
-	  cd ../window        && $(MAKE) $@ && \
-	  cd ../wxwidgets     && $(MAKE) $@ && \
-	  cd ../X11           && $(MAKE) $@)
diff --git a/samples/X11/Makefile b/samples/X11/Makefile
deleted file mode 100644
index eca4cee4..00000000
--- a/samples/X11/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = X11
-OBJ  = X11.o
-
-all: $(EXEC)
-
-X11: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-window -lsfml-system -lGLU -lGL -lX11
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/ftp/Makefile b/samples/ftp/Makefile
deleted file mode 100644
index 8bd25ae4..00000000
--- a/samples/ftp/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = ftp
-OBJ  = Ftp.o
-
-all: $(EXEC)
-
-ftp: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-network -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/opengl/Makefile b/samples/opengl/Makefile
deleted file mode 100644
index 42ff5ca4..00000000
--- a/samples/opengl/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = opengl
-OBJ  = OpenGL.o
-
-all: $(EXEC)
-
-opengl: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system -lGLU -lGL
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/pong/Makefile b/samples/pong/Makefile
deleted file mode 100644
index 314ace22..00000000
--- a/samples/pong/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = pong
-OBJ  = Pong.o
-
-all: $(EXEC)
-
-pong: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-audio -lsfml-graphics -lsfml-window -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/qt/Makefile b/samples/qt/Makefile
deleted file mode 100644
index 43d09cdd..00000000
--- a/samples/qt/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = qt
-OBJ  = Main.o QSFMLCanvas.o
-
-all: $(EXEC)
-
-qt: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system -lQtCore -lQtGui -lX11
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4 -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/shader/Makefile b/samples/shader/Makefile
deleted file mode 100644
index 9b3f7f79..00000000
--- a/samples/shader/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = shader
-OBJ  = Shader.o
-
-all: $(EXEC)
-
-shader: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/sockets/Makefile b/samples/sockets/Makefile
deleted file mode 100644
index 6adf0200..00000000
--- a/samples/sockets/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = sockets
-OBJ  = Sockets.o TCP.o UDP.o
-
-all: $(EXEC)
-
-sockets: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-network -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/sound/Makefile b/samples/sound/Makefile
deleted file mode 100644
index 495c13e9..00000000
--- a/samples/sound/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = sound
-OBJ  = Sound.o
-
-all: $(EXEC)
-
-sound: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-audio -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/sound_capture/Makefile b/samples/sound_capture/Makefile
deleted file mode 100644
index bc492175..00000000
--- a/samples/sound_capture/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = sound_capture
-OBJ  = SoundCapture.o
-
-all: $(EXEC)
-
-sound_capture: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-audio -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/voip/Makefile b/samples/voip/Makefile
deleted file mode 100644
index 1adca4ea..00000000
--- a/samples/voip/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = voip
-OBJ  = VoIP.o Client.o Server.o
-
-all: $(EXEC)
-
-voip: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-audio -lsfml-network -lsfml-system
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/window/Makefile b/samples/window/Makefile
deleted file mode 100644
index 6aa0abc2..00000000
--- a/samples/window/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = window
-OBJ  = Window.o
-
-all: $(EXEC)
-
-window: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-window -lsfml-system -lGLU
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/samples/wxwidgets/Makefile b/samples/wxwidgets/Makefile
deleted file mode 100644
index e6586ec8..00000000
--- a/samples/wxwidgets/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-EXEC = wxwidgets
-OBJ  = Main.o wxSFMLCanvas.o
-
-all: $(EXEC)
-
-wxwidgets: $(OBJ)
-	$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system `wx-config --libs` `pkg-config --libs gtk+-2.0`
-
-%.o: %.cpp
-	$(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/gtk-2.0 `wx-config --cppflags` `pkg-config --cflags gtk+-2.0`
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf *.o
-
-mrproper: clean
-	@rm -rf $(EXECPATH)/$(EXEC)
diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
deleted file mode 100644
index 713faa25..00000000
--- a/src/SFML/Audio/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-SRC = $(wildcard *.cpp)
-OBJ = $(SRC:.cpp=.o)
-
-LIB         = libsfml-audio.so
-LIBNAME     = $(LIB).$(VERSION)
-FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
-
-all: $(LIB)
-
-libsfml-audio.so: $(OBJ)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lsndfile -lopenal
-
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf $(OBJ)
-
-mrproper: clean
-	@rm -rf $(FULLLIBNAME)
-
-install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
-	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
-	$(LINK)
diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
deleted file mode 100644
index 28becbf2..00000000
--- a/src/SFML/Graphics/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-SRC     = $(wildcard *.cpp ./Linux/*.cpp)
-SRCGLEW = $(wildcard ./GLEW/*.c)
-SRCJPEG = $(wildcard ./libjpeg/*.c)
-SRCPNG  = $(wildcard ./libpng/*.c)
-SRCSOIL = $(wildcard ./SOIL/*.c)
-SRCZLIB = $(wildcard ./zlib/*.c)
-OBJ     = $(SRC:.cpp=.o)
-OBJGLEW = $(SRCGLEW:.c=.o)
-OBJJPEG = $(SRCJPEG:.c=.o)
-OBJPNG  = $(SRCPNG:.c=.o)
-OBJSOIL = $(SRCSOIL:.c=.o)
-OBJZLIB = $(SRCZLIB:.c=.o)
-
-LIB         = libsfml-graphics.so
-LIBNAME     = $(LIB).$(VERSION)
-FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
-
-all: $(LIB)
-
-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
-$(OBJSOIL): %.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
-
-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJZLIB): %.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGSEXT)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
-mrproper: clean
-	@rm -rf $(FULLLIBNAME)
-
-install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
-	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
-	$(LINK)
diff --git a/src/SFML/Makefile b/src/SFML/Makefile
deleted file mode 100644
index 0338446d..00000000
--- a/src/SFML/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-export CC         = gcc
-export CPP        = g++
-export CFLAGS     = -W -Wall -pedantic -g -O2 -DNDEBUG -I../../../include -I../../ -fPIC
-export CFLAGSEXT  = -I../../../include -I../.. -g -O2 -DNDEBUG -fPIC
-export LDFLAGS    = -shared
-export LIBPATH    = ../../../lib
-export VERSION    = 2.0
-export CP         = cp
-export LN         = ln
-export LNFLAGS    = -s -f
-export DESTDIR    = /usr/local
-export DESTLIBDIR = $(DESTDIR)/lib
-export DESTINCDIR = $(DESTDIR)/include
-export DESTDBGDIR = $(DESTLIBDIR)/debug/$(DESTLIBDIR)
-
-all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
-
-sfml-system:
-	@(mkdir -p ../../lib)
-	@(cd ./System && $(MAKE))
-
-sfml-window:
-	@(mkdir -p ../../lib)
-	@(cd ./Window && $(MAKE))
-
-sfml-network:
-	@(mkdir -p ../../lib)
-	@(cd ./Network && $(MAKE))
-
-sfml-graphics:
-	@(mkdir -p ../../lib)
-	@(cd ./Graphics && $(MAKE))
-
-sfml-audio:
-	@(mkdir -p ../../lib)
-	@(cd ./Audio && $(MAKE))
-
-.PHONY: clean mrproper
-
-clean:
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
-
-mrproper: clean
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
-
-install:
-	@(mkdir -p $(DESTLIBDIR))
-	@(mkdir -p $(DESTINCDIR))
-	@(mkdir -p $(DESTDBGDIR))
-	@(cd ./System && $(MAKE) $@	&& cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)/ && find $(DESTINCDIR)/SFML -name .svn -type d -print0 | xargs -0 /bin/rm -rf)
diff --git a/src/SFML/Network/Makefile b/src/SFML/Network/Makefile
deleted file mode 100644
index 035d38b4..00000000
--- a/src/SFML/Network/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-SRC = $(wildcard *.cpp ./Unix/*.cpp)
-OBJ = $(SRC:.cpp=.o)
-
-LIB         = libsfml-network.so
-LIBNAME     = $(LIB).$(VERSION)
-FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
-
-all: $(LIB)
-
-libsfml-network.so: $(OBJ)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ)
-
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf $(OBJ)
-
-mrproper: clean
-	@rm -rf $(FULLLIBNAME)
-
-install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
-	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
-	$(LINK)
diff --git a/src/SFML/System/Makefile b/src/SFML/System/Makefile
deleted file mode 100644
index f789ad20..00000000
--- a/src/SFML/System/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-SRC = $(wildcard *.cpp ./Unix/*.cpp)
-OBJ = $(SRC:.cpp=.o)
-
-LIB         = libsfml-system.so
-LIBNAME     = $(LIB).$(VERSION)
-FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
-
-all: $(LIB)
-
-libsfml-system.so: $(OBJ)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lpthread
-
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
-
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf $(OBJ)
-
-mrproper: clean
-	@rm -rf $(FULLLIBNAME)
-
-install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
-	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
-	$(LINK)
diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
deleted file mode 100644
index b5a0be87..00000000
--- a/src/SFML/Window/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-SRC = $(wildcard *.cpp ./Linux/*.cpp)
-OBJ = $(SRC:.cpp=.o)
-
-LIB         = libsfml-window.so
-LIBNAME     = $(LIB).$(VERSION)
-FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
-LINK        = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
-
-all: $(LIB)
-
-libsfml-window.so: $(OBJ)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lX11 -lXrandr -lGL
-
-$(OBJ): %.o: %.cpp
-	$(CPP) -o $@ -c $< $(CFLAGS)
-	
-.PHONY: clean mrproper
-
-clean:
-	@rm -rf $(OBJ)
-
-mrproper: clean
-	@rm -rf $(FULLLIBNAME)
-
-install:
-	objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
-	objcopy --strip-unneeded  $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
-	$(LINK)