diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-02-24 14:55:28 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-02-24 14:56:14 +0100 |
| commit | 5da35b1ee243f25c17dc9a5350ce6b56ed174031 (patch) | |
| tree | eeab416a5b734e25fa632b9c873993e2d82bfd39 /ext/gconf/Makefile.am | |
| parent | 6512b3eb81b8e98b9bde3e231d0a528e094ea5d6 (diff) | |
gconf: Rename gconf.[ch] to gstgconf.[ch] to prevent name conflicts
Diffstat (limited to 'ext/gconf/Makefile.am')
| -rw-r--r-- | ext/gconf/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gconf/Makefile.am b/ext/gconf/Makefile.am index 4f6f63ad..330cf29f 100644 --- a/ext/gconf/Makefile.am +++ b/ext/gconf/Makefile.am @@ -7,7 +7,7 @@ libgstgconfelements_la_SOURCES = \ gstgconfvideosink.c \ gstgconfvideosrc.c \ gstswitchsink.c \ - gconf.c + gstgconf.c DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\" libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS) @@ -22,4 +22,4 @@ noinst_HEADERS = \ gstgconfvideosink.h \ gstgconfvideosrc.h \ gstswitchsink.h \ - gconf.h + gstgconf.h |