Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
-all: tests/tests
-
-tests/tests: tests/test.m src/XMPPConnection.m src/XMPPStanza.m src/XMPPJID.m
-	objfw-compile -o $@ $^ -lidn -Wall -Werror -Isrc
+all:
+	cd src && ${MAKE} ${MFLAGS}
+	cd tests && ${MAKE} ${MFLAGS}
 
 clean:
-	rm -f src/*.o tests/*.o tests/tests
+	cd src && ${MAKE} ${MFLAGS} clean
+	cd tests && ${MAKE} ${MFLAGS} clean

ADDED   src/Makefile
Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -0,0 +1,6 @@
+all:
+	objfw-compile --lib 0.0 -o objxmpp *.m \
+		`pkg-config --cflags --libs libidn`
+
+clean:
+	rm -f *.o *.so *.dylib *.dll

Index: src/XMPPConnection.h
==================================================================
--- src/XMPPConnection.h
+++ src/XMPPConnection.h
@@ -1,7 +1,8 @@
 #import <ObjFW/ObjFW.h>
-#import <XMPPJID.h>
+
+#import "XMPPJID.h"
 
 @class XMPPConnection;
 @class XMPPIQ;
 @class XMPPMessage;
 @class XMPPPresence;

ADDED   tests/Makefile
Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -0,0 +1,5 @@
+all:
+	objfw-compile -o tests *.m -I../src -L../src -lobjxmpp
+
+clean:
+	rm -f tests *.o

Index: tests/test.m
==================================================================
--- tests/test.m
+++ tests/test.m
@@ -1,7 +1,9 @@
 #include <assert.h>
+
 #import <ObjFW/ObjFW.h>
+
 #import "XMPPConnection.h"
 #import "XMPPStanza.h"
 
 @interface AppDelegate: OFObject
 {