more template fixes

[platform/upstream/gst-plugins-good.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 46c6f5b..0119fad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,5 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-if USE_GCONFTOOL
-GCONF_DIR = gconf
-else
-GCONF_DIR =
-endif
-
 ALWAYS_SUBDIRS =               \
        gst sys ext             \
        tests                   \
@@ -15,14 +9,9 @@ ALWAYS_SUBDIRS =              \
        m4                      \
        pkgconfig
 
-SUBDIRS =                      \
-       $(ALWAYS_SUBDIRS)       \
-       $(GCONF_DIR)
-
-DIST_SUBDIRS =                         \
-       $(ALWAYS_SUBDIRS)       \
-       gconf
+SUBDIRS = $(ALWAYS_SUBDIRS)
 
+DIST_SUBDIRS = $(ALWAYS_SUBDIRS)
 
 # include before EXTRA_DIST for win32 assignment
 include $(top_srcdir)/common/win32.mak
@@ -55,5 +44,40 @@ check-torture:
        true
 endif
 
+win32-update:
+       for f in gst/udp/gstudp-marshal.c \
+                gst/udp/gstudp-marshal.h \
+                gst/udp/gstudp-enumtypes.c \
+                gst/udp/gstudp-enumtypes.h \
+                gst/rtpmanager/gstrtpbin-marshal.c \
+                gst/rtpmanager/gstrtpbin-marshal.h ; do \
+               cp $(top_builddir)/$$f win32/common; done
+       $(top_srcdir)/common/gst-indent win32/common/gstudp-marshal.c
+       $(top_srcdir)/common/gst-indent win32/common/gstudp-marshal.c
+       $(top_srcdir)/common/gst-indent win32/common/gstudp-enumtypes.c
+       $(top_srcdir)/common/gst-indent win32/common/gstudp-enumtypes.c
+       $(top_srcdir)/common/gst-indent gst/rtpmanager/gstrtpbin-marshal.c
+       $(top_srcdir)/common/gst-indent gst/rtpmanager/gstrtpbin-marshal.c
+       cp $(top_builddir)/win32/common/config.h-new \
+           $(top_srcdir)/win32/common/config.h
+
 include $(top_srcdir)/common/coverage/lcov.mak
 
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+       $(top_builddir)/common/shave \
+       $(top_builddir)/common/shave-libtool \
+       $(top_builddir)/gst/qtdemux/.libs/*.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/quicktime/.libs/*.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*videoflip.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*videobalance.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*gamma.{so,dll,DLL,dylib}
+
+CRUFT_DIRS = \
+       $(top_srcdir)/gst/qtdemux \
+       $(top_srcdir)/gst/quicktime
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft