diff --git a/src/Makefile.am b/src/Makefile.am
index 761ec46..6894e90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 IFACE = interface/subject.c \
 	interface/observer.c
diff --git a/src/asset/Makefile.am b/src/asset/Makefile.am
index ecd0fbd..0a855ea 100644
--- a/src/asset/Makefile.am
+++ b/src/asset/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libasset.a
 
diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 4c30e86..3233da7 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libauth.a
 
diff --git a/src/cbuf/Makefile.am b/src/cbuf/Makefile.am
index 9a8ff86..69b9f9b 100644
--- a/src/cbuf/Makefile.am
+++ b/src/cbuf/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 CB = cbuf.c read.c \
      get_line.c set_data.c get_data.c \
diff --git a/src/class/Makefile.am b/src/class/Makefile.am
index 435650b..c7349f2 100644
--- a/src/class/Makefile.am
+++ b/src/class/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libclass.a
 
diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am
index 5fbd9cc..294c8cc 100644
--- a/src/hash/Makefile.am
+++ b/src/hash/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 HASH = hash.c add.c get.c delete.c each.c value.c \
        interface/hashable.c
diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index fae3a54..b3745b6 100644
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 MSG    = message.c \
 	 message/has_keep_alive.c \
diff --git a/src/logger/Makefile.am b/src/logger/Makefile.am
index 461499f..d123437 100644
--- a/src/logger/Makefile.am
+++ b/src/logger/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = liblogger.a
 
diff --git a/src/queue/Makefile.am b/src/queue/Makefile.am
index 6fb286c..b5faed2 100644
--- a/src/queue/Makefile.am
+++ b/src/queue/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libqueue.a
 
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 4126672..1fccbbb 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 SERVER = server.c run.c close_conn.c poll.c \
 	 handle_accept.c read.c write.c
diff --git a/src/session/Makefile.am b/src/session/Makefile.am
index 2892b01..a3d1d2e 100644
--- a/src/session/Makefile.am
+++ b/src/session/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libsession.a
 
diff --git a/src/socket/Makefile.am b/src/socket/Makefile.am
index 03b233a..9b36839 100644
--- a/src/socket/Makefile.am
+++ b/src/socket/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 noinst_LIBRARIES = libsocket.a
 
diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am
index 073f18e..2cb599e 100644
--- a/src/stream/Makefile.am
+++ b/src/stream/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 STREAM = stream.c read.c write.c
 IFACE  = interface/reader.c \
diff --git a/src/tree/Makefile.am b/src/tree/Makefile.am
index 1a97ae7..b88378b 100644
--- a/src/tree/Makefile.am
+++ b/src/tree/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 TREE = tree.c find.c insert.c inOrderSuccessor.c delete.c walk.c \
        rotateLeft.c rotateRight.c destroy.c