diff --git a/configure.ac b/configure.ac
index 4a89a36..d5a6154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,9 @@
 # Init the 42sh project
 AC_INIT([42sh], [1.0], [matteo.flebus@epita.fr])
 
+FLAGS="-std=c99 -pedantic -Werror -Wall -Wextra -Wvla"
+AC_SUBST([FLAGS])
+
 # Setup Automake
 AM_INIT_AUTOMAKE([subdir-objects] [foreign])
 
@@ -21,10 +24,14 @@ AC_PROG_CC
 
 # List Makefiles in subdirectories
 AC_CONFIG_FILES([
-                    Makefile
                     src/Makefile
                     src/ast/Makefile
                     src/parser/Makefile
                     src/lexer/Makefile
+                    src/io_backend/Makefile
+                    src/execution/Makefile
+                    src/expansion/Makefile
+                    src/utils/Makefile
                 ])
+                    # TODO add tests Makefile here
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ecd21f..3e0ecf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,13 @@
 # define the subdirectories
 SUBDIRS = \
-		ast \
 		parser \
 		lexer \
 		io_backend \
 		execution \
-		expansin \
+		expansion \
 		utils
 
-bin_PROGRAMS = 42sh
+bin_PROGRAMS = 42sh 42sh_asan
 
 42sh_SOURCES = main.c
 
@@ -17,7 +16,6 @@ bin_PROGRAMS = 42sh
 42sh_CFLAGS = -std=c99 -pedantic -Werror -Wall -Wextra -Wvla
 
 42sh_LDADD =  \
-		ast/libast.a \
 		parser/libparser.a \
 		lexer/liblexer.a \
 		io_backend/libio_backend.a \
@@ -28,8 +26,6 @@ bin_PROGRAMS = 42sh
 
 ################################################# Test
 
-bin_PROGRAMS = 42sh_asan
-
 42sh_asan_SOURCES = main.c
 
 42sh_asan_CPPFLAGS = -I%D%
@@ -37,10 +33,10 @@ bin_PROGRAMS = 42sh_asan
 42sh_asan_CFLAGS = -std=c99 -pedantic -Werror -Wall -Wextra -Wvla -g -fsanitize=address
 
 42sh_asan_LDADD =  \
-		ast/libast.a \
-		parser/libparser.a \
-		lexer/liblexer.a \
-		io_backend/libio_backend.a \
-		expansion/libexpansion.a \
-		execution/libexecution.a \
-		utils/libutils.a
+		ast/lib_asan_ast.a \
+		parser/lib_asan_parser.a \
+		lexer/lib_asan_lexer.a \
+		io_backend/lib_asan_io_backend.a \
+		expansion/lib_asan_expansion.a \
+		execution/lib_asan_execution.a \
+		utils/lib_asan_utils.a
diff --git a/src/lexer/Makefile.am b/src/lexer/Makefile.am
index a113221..26f7797 100644
--- a/src/lexer/Makefile.am
+++ b/src/lexer/Makefile.am
@@ -1,4 +1,4 @@
-lib_LIBRARIES = liblexer.a
+lib_LIBRARIES = liblexer.a lib_asan_lexer.a
 
 liblexer_a_SOURCES =  \
   lexer.c \
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 51c8cb6..4263c5a 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -6,6 +6,6 @@ libparser_a_SOURCES =  \
 
 libparser_a_CPPFLAGS = -I$(top_srcdir)/src
 
-libparser_a_CFLAGS = -std=c99 -pedantic -Werror -Wall -Wextra -Wvla
+libparser_a_CFLAGS = $(FLAGS)
 
 noinst_LIBRARIES = libparser.a