Some random ramblings about interactivity

[platform/upstream/gstreamer.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cfb9e41..4564aa5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,6 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-# if libglade and gnome1 are present, build the player and editor
-# if libglade and gnome2, only the player
-# otherwise none
-
-if HAVE_LIBGLADE_GNOME
-if HAVE_GNOME
-SUBDIRS_LGG = gstplay editor
-else
-SUBDIRS_LGG = gstplay
-endif
-else
-SUBDIRS_LGG =
-endif
- 
 if BUILD_DOCS
 SUBDIRS_DOCS = docs
 else
@@ -22,7 +8,7 @@ SUBDIRS_DOCS =
 endif
 
 if BUILD_TESTS
-SUBDIRS_TESTS = test tests testsuite
+SUBDIRS_TESTS = tests testsuite
 else
 SUBDIRS_TESTS =
 endif
@@ -33,12 +19,11 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-SUBDIRS = include gst libs tools $(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) \
-$(SUBDIRS_LGG) $(SUBDIRS_DOCS)
+SUBDIRS = include gst libs tools \
+       $(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
 
 # These are all the possible subdirs
-DIST_SUBDIRS = include gst libs tools test tests testsuite examples gstplay editor docs
-
+DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gstreamer.pc
@@ -46,11 +31,12 @@ pkgconfig_DATA = gstreamer.pc
 EXTRA_DIST = gstreamer.spec.in \
             gstreamer.pc.in gstreamer-uninstalled.pc.in \
             configure.ac autogen.sh depcomp \
-            LICENSE REQUIREMENTS ABOUT-NLS \
-            idiottest.mak
+            REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \
+            idiottest.mak common
 
 dist-hook:
        cp gstreamer.spec $(distdir)
+       rm -rf `find $(distdir)/common -name CVS`
 
 rpm: dist
        rpm -ta $(distdir).tar.gz