From 63886c8b3c8a06f7b3815d862ae97175a0175991 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lo=C3=AFc=20Minier?= Date: Sat, 3 Mar 2007 13:06:21 +0000 Subject: [PATCH] Don't mix tabs and spaces (#414168). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Original commit message from CVS: Patch by: Loïc Minier * ext/libcaca/Makefile.am: * gst/debug/Makefile.am: Don't mix tabs and spaces (#414168). --- ChangeLog | 8 ++++++++ ext/libcaca/Makefile.am | 2 +- gst/debug/Makefile.am | 16 ++++++++-------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7939586..01e3902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-03 Tim-Philipp Müller + + Patch by: Loïc Minier + + * ext/libcaca/Makefile.am: + * gst/debug/Makefile.am: + Don't mix tabs and spaces (#414168). + 2007-03-02 Stefan Kost * tests/check/generic/.cvsignore: diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am index 4155803..9867115 100644 --- a/ext/libcaca/Makefile.am +++ b/ext/libcaca/Makefile.am @@ -7,7 +7,7 @@ libgstcacasink_la_CFLAGS = \ $(LIBCACA_CFLAGS) libgstcacasink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - $(GST_BASE_LIBS) \ + $(GST_BASE_LIBS) \ $(LIBCACA_LIBS) libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am index 3dff152..6eceb03 100644 --- a/gst/debug/Makefile.am +++ b/gst/debug/Makefile.am @@ -1,7 +1,7 @@ if GST_HAVE_MMAP - EFENCE_PLUGIN=libgstefence.la +EFENCE_PLUGIN=libgstefence.la else - EFENCE_PLUGIN= +EFENCE_PLUGIN= endif plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la @@ -25,17 +25,17 @@ libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBM) libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - + libgstdebug_la_SOURCES = \ gstdebug.c \ - breakmydata.c \ - progressreport.c \ - progressreport.h \ + breakmydata.c \ + progressreport.c \ + progressreport.h \ gstnavseek.c \ gstpushfilesrc.c \ gstpushfilesrc.h \ - tests.c \ - testplugin.c + tests.c \ + testplugin.c # negotiation.c libgstdebug_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) -- 2.7.4