3 files changed, 2 insertions, 20 deletions
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 9f24d517..9cf3df84 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,8 +1,2 @@
-if USE_SINE
-SINE_DIR=sine
-else
-SINE_DIR=
-endif
-
-SUBDIRS=$(SINE_DIR)
-DIST_SUBDIRS=sine
+SUBDIRS=$(GST_PLUGINS_SELECTED)
+DIST_SUBDIRS=$(GST_PLUGINS_ALL)
diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index 16ef66e3..e37d851b 100644
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -1,12 +1,3 @@
-if HAVE_AVIFILE
-ARCHSUBDIRS = wincodec
-else
-ARCHSUBDIRS =
-endif
-
-SUBDIRS = $(ARCHSUBDIRS) winaudio
-DIST_SUBDIRS = wincodec winaudio
-
 filterdir = $(libdir)/gst
 
 filter_LTLIBRARIES = libgstavimux.la libgstavidecoder.la libgstavidemux.la libgstavitypes.la libgstaviaudiodecoder.la
@@ -27,5 +18,3 @@ libgstavimux_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
 libgstaviaudiodecoder_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS)
 
 EXTRA_DIST = README_win32dll README
-
-noinst_HEADERS = aviaudiodecoder.h
diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am
index 76a73f79..c32b56eb 100644
--- a/gst/law/Makefile.am
+++ b/gst/law/Makefile.am
@@ -9,4 +9,3 @@ libgstmulaw_la_SOURCES = mulaw-encode.c mulaw-conversion.c mulaw-decode.c mulaw.
 libgstmulaw_la_CFLAGS = $(GST_CFLAGS)
 
 noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h alaw-conversion.h mulaw-encode.h mulaw-decode.h
-filterdir = $(libdir)/gst