--- sauerbraten/src/Makefile
+++ sauerbraten/src/Makefile
@@ -1,6 +1,8 @@
-CXX=g++
-CXXOPTFLAGS=-O3 -fomit-frame-pointer
-CXXFLAGS=$(CXXOPTFLAGS)	-Wall -fsigned-char -Ienet/include -I. -Ishared -Iengine -Ifpsgame `sdl-config --cflags`
+ifeq ($(origin CXXFLAGS), default)
+	CXXFLAGS := -O3 -fomit-frame-pointer
+endif
+INCLUDES := -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include `sdl-config --cflags`
+CXXFLAGS := $(CXXFLAGS) -fsigned-char $(INCLUDES)
 
 PLATFORM_PREFIX=native
 CLIENT_LIBS=-Lenet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU 
@@ -44,7 +46,7 @@
 
 default: all
 
-all: libenet client server
+all: client server
 
 enet/Makefile:
 	cd enet; ./configure
@@ -62,10 +64,10 @@
 fpsgame/fps-standalone.o:
 	$(CXX) $(CXXFLAGS) -DSTANDALONE	-c -o fpsgame/fps-standalone.o fpsgame/fps.cpp
 
-client:	$(CLIENT_OBJS)
+client:	libenet $(CLIENT_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
 
-server:	$(SERVER_OBJS)
+server:	libenet $(SERVER_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
 	
 install: all