diff --git a/ChangeLog b/ChangeLog index 167041ed1d..7de209c4e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Tim-Philipp Müller + + * Makefile.am: + The check-exports stuff moved to common/win32.mak, so include that. + 2007-12-17 Wim Taymans * libs/gst/base/gstbasesrc.c: (gst_base_src_wait_playing), diff --git a/Makefile.am b/Makefile.am index 098b82ce93..ada3d7aa87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,10 +23,8 @@ DIST_SUBDIRS = \ pkgconfig po \ common -win32 = $(shell cat $(top_srcdir)/win32/MANIFEST) - -debug: - echo $(win32) +# include before EXTRA_DIST for win32 assignment +include $(top_srcdir)/common/win32.mak EXTRA_DIST = \ gstreamer.spec gstreamer.spec.in \ @@ -113,20 +111,5 @@ 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 ) -corelibs='libgstreamer libgstbase libgstcontroller libgstdataprotocol libgstnet' -check-exports: - for l in `eval echo $(corelibs)`; 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 a00d4c1966..208ef72f86 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a00d4c1966aab517c2694c61d580489ebcbce448 +Subproject commit 208ef72f86e944e6ba6941c68e57ffcea8d2a8f4