Simplify

diff --git a/modules/common.am b/modules/common.am
index 4076374d6e892de91d7173e43ef8fb2ec6bda593..47aa97c3f42cd608c0878ee0d18eab2801f18d94 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -11,7 +11,7 @@ libvlcdir = $(libdir)/vlc/$(basedir)
 libvlc_LTLIBRARIES =
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
-CLEANFILES =
+CLEANFILES = $(BUILT_SOURCES)
 
 include $(srcdir)/Modules.am
 

diff --git a/modules/genmf b/modules/genmf
index 2abb3a2e40fa108fc12bad096cdd6c87fff723eb..d05594ad73671784f1e910d13133219a1471eef4 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -39,24 +39,13 @@ include \$(top_srcdir)/modules/common.am
 EOF
   for mod in $mods
   do
-    if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
-        NODIST=''; else
-        NODIST='#'; fi
     cat >> m4/private.m4 << EOF
     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
     cat >> "${makf}" << EOF
 # The ${mod} plugin
-EOF
-    cat >> "${makf}" << EOF
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
-CLEANFILES += \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
 lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS)
 lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS)
 lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS)