diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index 67aa7203e0..3683a2593c 100644
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -1,31 +1,25 @@
+
 noinst_LTLIBRARIES = libgstparse.la
 
-libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
+BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c 
+CLEANFILES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c 
 
-BISON = bison -d -v -p_gst_parse__yy
+EXTRA_DIST = grammar.y parse.l types.h
 
+nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
 libgstparse_la_CFLAGS = $(GST_CFLAGS)
 libgstparse_la_LIBADD = $(LIBGST_LIBS)
 
 noinst_HEADERS = grammar.tab.h
 
-BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c 
-
-EXTRA_DIST = grammar.y parse.l types.h
-
 grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.h
-	$(BISON) $(srcdir)/grammar.y
+	$(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y
  
+lex._gst_parse_yy.c: parse.l
+	$(FLEX_PATH) -P_gst_parse_yy $^
+
 ## this is so make install without a previous make can work, because
 ## this dir needs gstmarshal.h generated
 ../gstmarshal.h:
 	cd .. && make gstmarshal.h
 
-lex._gst_parse_yy.c: parse.l
-	flex -P_gst_parse_yy $^
-
-dist-hook:
-	rm -f $(BUILT_SOURCES)
-
-clean-local:
-	rm -f $(BUILT_SOURCES)