diff --git a/Makefile.am b/Makefile.am
index bc54517..5957b31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
 #create_token_LDADD   = src/libtoken.la $(LIBOBJS)
 #create_token_CFLAGS  = -Wall -I include
 
-
 EXTRA_DIST = include
 
 SUBDIRS = src tests
diff --git a/src/Makefile.am b/src/Makefile.am
index 060c286..b3f75e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 CLASS  = class.c interface.c interface/class.c
 SOCKET = socket.c socket/accept.c socket/connect.c socket/listen.c
 SERVER = server.c server/run.c server/close_conn.c
-LOGGER = logger.c interface/logger.c logger/stderr.c logger/syslog.c
+LOGGER = logger.c logger/stderr.c logger/syslog.c interface/logger.c
+
+AM_CFLAGS = -Wall -I ../include/
 
 bin_PROGRAMS = testserver
 
-testserver_SOURCES = testserver.c $(CCLASS) $(SOCKET) $(SERVER) $(LOGGER) signalHandling.c daemonize.c
-testserver_CFLAGS  = -Wall -I ../include
+testserver_SOURCES = testserver.c $(CLASS) $(SOCKET) $(SERVER) $(LOGGER) signalHandling.c daemonize.c
+testserver_CFLAGS  = -Wall -I ../include/