From e90bbb06697f5bbb0f7f00fc5af3a45c83f4f7e4 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Thu, 18 Mar 2004 17:07:12 +0000
Subject: [PATCH] fix automake

Original commit message from CVS:
fix automake
---
 ChangeLog       |  4 ++++
 gst/Makefile.am | 22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ff0b14ea5..45489132f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-18  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/Makefile.am: fix automake don'ts
+
 2004-03-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* examples/gst/player.py:
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 6ff3b75292..ebe892a4b9 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -20,7 +20,21 @@ pygstexecdir = $(pkgpyexecdir)
 GST_OVERRIDES = gst.override gstpad-handlers.override
 GST_DEFS = gst.defs gst-types.defs
 
-pygstexec_LTLIBRARIES = _gst.la
+# what shall we build ?
+if BUILD_INTERFACES
+interface_lib = interfaces.la
+else
+interface_lib =
+endif
+if BUILD_PLAY
+play_lib = play.la
+else
+play_lib =
+endif
+
+pygstexec_LTLIBRARIES = _gst.la $(interface_lib) $(play_lib)
+
+# how shall we build them ?
 _gst_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing
 _gst_la_LIBADD = $(GST_LIBS)
 _gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst
@@ -35,9 +49,6 @@ gst.c: $(GST_DEFS) $(GST_OVERRIDES)
 PLAY_OVERRIDES = play.override
 PLAY_DEFS = play.defs
 
-if BUILD_PLAY
-pygstexec_LTLIBRARIES += play.la
-endif
 play_la_CFLAGS = $(GST_CFLAGS) $(GST_PLAY_CFLAGS) -fno-strict-aliasing
 play_la_LIBADD = $(GST_LIBS) $(GST_PLAY_LIBS)
 play_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initplay
@@ -52,9 +63,6 @@ play.c: $(PLAY_DEFS) $(PLAY_OVERRIDES)
 INTERFACES_OVERRIDES = interfaces.override xoverlay.override
 INTERFACES_DEFS = interfaces.defs xoverlay.defs xwindowlistener.defs
 
-if BUILD_INTERFACES
-pygstexec_LTLIBRARIES += interfaces.la
-endif
 interfaces_la_CFLAGS = $(GST_CFLAGS) $(GST_INTERFACES_CFLAGS) -fno-strict-aliasing
 interfaces_la_LIBADD = $(GST_LIBS) $(GST_INTERFACES_LIBS)
 interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface