Makefile.am: Use new common/win32.mak.
authorTim-Philipp Müller <tim@centricular.net>
Mon, 17 Dec 2007 23:41:14 +0000 (23:41 +0000)
committerTim-Philipp Müller <tim@centricular.net>
Mon, 17 Dec 2007 23:41:14 +0000 (23:41 +0000)
Original commit message from CVS:
* Makefile.am:
Use new common/win32.mak.

ChangeLog
Makefile.am
common

index 5893066..8d181e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * Makefile.am:
+         Use new common/win32.mak.
+
 2007-12-17  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst-libs/gst/audio/gstbaseaudiosrc.c:
index f633935..6187b00 100644 (file)
@@ -28,7 +28,8 @@ DIST_SUBDIRS =                        \
        m4                      \
        pkgconfig
 
-win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
        gst-plugins-base.spec depcomp \
@@ -62,21 +63,6 @@ win32-update:
 
 include $(top_srcdir)/common/coverage/lcov.mak
 
-# make sure all symbols we export on linux are defined in the win32 .def too
-# (don't care about other unixes for now, it's enough if it works on one of
-# the linux build bots; we assume .so )
-baselibs='libgstaudio libgstrtp libgstpbutils libgsttag libgstnetbuffer \
-libgstinterfaces libgstvideo libgstriff libgstrtsp libgstcdda'
-check-exports:
-       for l in `eval echo $(baselibs)`; do \
-         libso=`find "$(top_builddir)" -name "$$l-0.10.so"`; \
-         libdef="$(top_srcdir)/win32/common/$$l.def"; \
-         if test "x$$libso" != "x"; then \
-           echo Checking symbols in $$libso; \
-           $(top_srcdir)/common/check-exports $$libdef $$libso || exit 1; \
-         fi; \
-       done
-
 check: check-exports
 
 
diff --git a/common b/common
index a00d4c1..67b8f4e 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a00d4c1966aab517c2694c61d580489ebcbce448
+Subproject commit 67b8f4e3c576945f4d778c9040876af3a5a0756e