diff --git a/demo/Makefile.am b/demo/Makefile.am
index 7b8e02b..1715f5b 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -35,5 +35,6 @@ ${generated_sources}: ${top_srcdir}/demo/rpc_table.py
 	@echo "[libsearpc]: done"
 
 clean-local:
-	-rm ${generated_sources}
+	rm -f ${generated_sources}
+	rm -f rpc_table.pyc
 
diff --git a/json-glib/build/autotools/Makefile.am.enums b/json-glib/build/autotools/Makefile.am.enums
index 0f34732..50a4cc4 100644
--- a/json-glib/build/autotools/Makefile.am.enums
+++ b/json-glib/build/autotools/Makefile.am.enums
@@ -19,7 +19,7 @@ enum_tmpl_h=$(glib_enum_h:.h=.h.in)
 enum_tmpl_c=$(glib_enum_c:.c=.c.in)
 
 CLEANFILES += stamp-enum-types
-DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
+#DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
 BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c)
 
diff --git a/json-glib/build/autotools/Makefile.am.marshal b/json-glib/build/autotools/Makefile.am.marshal
index cab117d..a788d7f 100644
--- a/json-glib/build/autotools/Makefile.am.marshal
+++ b/json-glib/build/autotools/Makefile.am.marshal
@@ -18,7 +18,7 @@ marshal_h = $(glib_marshal_list:.list=.h)
 marshal_c = $(glib_marshal_list:.list=.c)
 
 CLEANFILES += stamp-marshal
-DISTCLEANFILES += $(marshal_h) $(marshal_c)
+#DISTCLEANFILES += $(marshal_h) $(marshal_c)
 BUILT_SOURCES += $(marshal_h) $(marshal_c)
 EXTRA_DIST += $(srcdir)/$(glib_marshal_list)
 
diff --git a/json-glib/json-glib/Makefile.am b/json-glib/json-glib/Makefile.am
index 367ebf4..f6bf248 100644
--- a/json-glib/json-glib/Makefile.am
+++ b/json-glib/json-glib/Makefile.am
@@ -26,7 +26,7 @@ AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS) -fPIC
 BUILT_SOURCES =
 
 CLEANFILES =
-DISTCLEANFILES = json-version.h
+#DISTCLEANFILES = json-version.h
 
 source_h = \
 	$(top_srcdir)/json-glib/json-builder.h		\
@@ -88,7 +88,7 @@ jsoninclude_DATA = \
 	$(top_srcdir)/json-glib/json-glib.h		\
 	$(NULL)
 
-EXTRA_DIST += json-version.h.in json-glib.h json-version.h
+EXTRA_DIST += json-version.h.in json-glib.h
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 686d0f1..6935b63 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,5 +27,6 @@ ${generated_sources}: $(top_srcdir)/tests/rpc_table.py
 	@echo "[libsearpc]: done"
 
 clean-local:
-	-rm ${generated_sources}
+	rm -f ${generated_sources}
+	rm -f rpc_table.pyc