diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2009-06-05 21:17:55 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2009-06-05 21:29:46 +0300 |
| commit | 4d9a0e832cfc69c612e32902017390560024cd7e (patch) | |
| tree | f60c3bd613e97b36f02efb7d1271a24d9cccebf2 | |
| parent | 0e1ee9031a955a947e5268499556fd020b5914df (diff) | |
| download | gst-plugins-bad-4d9a0e832cfc69c612e32902017390560024cd7e.tar.gz gst-plugins-bad-4d9a0e832cfc69c612e32902017390560024cd7e.tar.bz2 gst-plugins-bad-4d9a0e832cfc69c612e32902017390560024cd7e.zip | |
camerabin: fix link order
Move local version up in the link order.
| -rw-r--r-- | gst/camerabin/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am index 4f382243..d5085da9 100644 --- a/gst/camerabin/Makefile.am +++ b/gst/camerabin/Makefile.am @@ -25,9 +25,9 @@ nodist_libgstcamerabin_la_SOURCES = $(built_sources) libgstcamerabin_la_CFLAGS = \ $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API libgstcamerabin_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \ $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-$(GST_MAJORMINOR) \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la + -lgstinterfaces-$(GST_MAJORMINOR) libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index cbc228e2..940d1f4b 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -108,9 +108,10 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_ LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) elements_camerabin_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CHECK_CFLAGS) -elements_camerabin_LDADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la +elements_camerabin_LDADD = \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ + $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CHECK_LIBS) \ + -lgstinterfaces-@GST_MAJORMINOR@ elements_camerabin_SOURCES = elements/camerabin.c elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) |