summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Minier <lool+gnome@via.ecp.fr>2007-03-03 13:06:21 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-03-03 13:06:21 +0000
commit63886c8b3c8a06f7b3815d862ae97175a0175991 (patch)
treec9d3da12893996de3c9f5d8300b7c86de1438041
parentf36d948b34e140503fa1e320337f4e324828f94e (diff)
Don't mix tabs and spaces (#414168).
Original commit message from CVS: Patch by: Loïc Minier <lool+gnome at via ecp fr> * ext/libcaca/Makefile.am: * gst/debug/Makefile.am: Don't mix tabs and spaces (#414168).
-rw-r--r--ChangeLog8
-rw-r--r--ext/libcaca/Makefile.am2
-rw-r--r--gst/debug/Makefile.am16
3 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7939586b..01e3902c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-03 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Loïc Minier <lool+gnome at via ecp fr>
+
+ * ext/libcaca/Makefile.am:
+ * gst/debug/Makefile.am:
+ Don't mix tabs and spaces (#414168).
+
2007-03-02 Stefan Kost <ensonic@users.sf.net>
* tests/check/generic/.cvsignore:
diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index 4155803e..9867115a 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 3dff1524..6eceb03f 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)