From 2465df5cdba37333ca566b144f87c1c63aac63bb Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 2 Jan 2004 23:42:30 +0000 Subject: [PATCH] sys/: Move interface libs from LDFLAGS to LIBADD, fix relocation errors after installation (see #127664). Original commit message from CVS: 2004-01-03 Ronald Bultje * sys/ximage/Makefile.am: * sys/xvideo/Makefile.am: * sys/xvimage/Makefile.am: Move interface libs from LDFLAGS to LIBADD, fix relocation errors after installation (see #127664). --- ChangeLog | 8 ++++++++ sys/ximage/Makefile.am | 7 +++---- sys/xvimage/Makefile.am | 7 +++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f4bdcb5f1..7d3fb0a510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-01-03 Ronald Bultje + + * sys/ximage/Makefile.am: + * sys/xvideo/Makefile.am: + * sys/xvimage/Makefile.am: + Move interface libs from LDFLAGS to LIBADD, fix relocation errors + after installation (see #127664). + 2004-01-02 David Schleef * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init), diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index d3fe2c179e..5cd2b54049 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -3,10 +3,9 @@ plugin_LTLIBRARIES = libgstximagesink.la libgstximagesink_la_SOURCES = ximagesink.c libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) -libgstximagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ - $(top_builddir)/gst-libs/gst/navigation/libgstnavigation.la \ - $(top_builddir)/gst-libs/gst/xoverlay/libgstxoverlay.la +libgstximagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) \ + $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la +libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = ximagesink.h diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am index c9886a9467..012e7753a9 100644 --- a/sys/xvimage/Makefile.am +++ b/sys/xvimage/Makefile.am @@ -3,10 +3,9 @@ plugin_LTLIBRARIES = libgstxvimagesink.la libgstxvimagesink_la_SOURCES = xvimagesink.c libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) -libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) -libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ - $(top_builddir)/gst-libs/gst/navigation/libgstnavigation.la \ - $(top_builddir)/gst-libs/gst/xoverlay/libgstxoverlay.la +libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) \ + $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la +libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = xvimagesink.h