Fix files names according to coding conventions

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 1d44d575fdadeaa4a4c8c4e14b6635c436fc9509..d09158aec97e1dbc959a84dedff339c248704b55 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -1,20 +1,21 @@
 
 BUILT_SOURCES = \
-       champlain-gtk-marshal.h \
-       champlain-gtk-marshal.c 
+       champlain-gtk-marshal.h          \
+       champlain-gtk-marshal.c
 
 CLEANFILES = $(BUILT_SOURCES)
 
 CHAMPLAIN_GTK_MARSHAL = champlain-gtk-marshal
-CHAMPLAIN_GTK_MARSHAL_LIST = champlain-gtk-marshal.list 
+CHAMPLAIN_GTK_MARSHAL_LIST = champlain-gtk-marshal.list
 
 lib_LTLIBRARIES = libchamplain-gtk-0.2.la
 
-libchamplain_gtk_0_2_la_SOURCES = $(CHAMPLAIN_GTK_MARSHAL_LIST) \
-                                       $(BUILT_SOURCES) \
-                                       champlainviewembed.c
+libchamplain_gtk_0_2_la_SOURCES = \
+       $(CHAMPLAIN_GTK_MARSHAL_LIST)            \
+       $(BUILT_SOURCES)                        \
+       champlain-view-embed.c
 
-noinst_HEADERS = champlainviewembed.h
+noinst_HEADERS = champlain-view-embed.h
 
 libchamplain_gtk_0_2_la_LIBADD = $(DEPS_LIBS) $(CPLAIN_DEPS_LIBS)
 
@@ -25,7 +26,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --body --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).c
 
 libchamplain_includedir=$(includedir)/libchamplain-gtk-0.2/champlain-gtk
-libchamplain_include_HEADERS = champlain-gtk.h champlainviewembed.h
+libchamplain_include_HEADERS = champlain-gtk.h champlain-view-embed.h
 
 libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 

diff --git a/champlain-gtk/champlain-gtk.h b/champlain-gtk/champlain-gtk.h
index e54b8476f1baf38b282c40a4104bad635eb402bc..638d625a45c90424ca85663ffbeded2cc53e004b 100644 (file)
--- a/champlain-gtk/champlain-gtk.h
+++ b/champlain-gtk/champlain-gtk.h
@@ -21,7 +21,7 @@
 
 #define __CHAMPLAIN_GTK_CHAMPLAIN_GTK_H_INSIDE__
 
-#include <champlain-gtk/champlainviewembed.h>
+#include <champlain-gtk/champlain-view-embed.h>
 
 #undef __CHAMPLAIN_GTK_CHAMPLAIN_GTK_H_INSIDE__
 

diff --git a/champlain-gtk/champlainviewembed.c b/champlain-gtk/champlain-view-embed.c
similarity index 99%
rename from champlain-gtk/champlainviewembed.c
rename to champlain-gtk/champlain-view-embed.c
index 7d3bd1ac22e5ea8a28248323cd914a03ca305832..6732ac5476ef3850675379887e45d718e7fb090c 100644 (file)
--- a/champlain-gtk/champlainviewembed.c
+++ b/champlain-gtk/champlain-view-embed.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include <champlainviewembed.h>
+#include <champlain-view-embed.h>
 #include <champlain/champlain.h>
 
 #include <gtk/gtk.h>

diff --git a/champlain-gtk/champlainviewembed.h b/champlain-gtk/champlain-view-embed.h
similarity index 100%
rename from champlain-gtk/champlainviewembed.h
rename to champlain-gtk/champlain-view-embed.h

diff --git a/configure.ac b/configure.ac
index 66331d77b245117f6f0507b53d9fffd72023e1bc..bcdc7f547618d37a701fd63332614e23b7c2cbf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT(libchamplain-gtk, 0.2.8, pierre-luc@pierlux.com)
-AC_CONFIG_SRCDIR([champlain-gtk/champlainviewembed.h])
+AC_CONFIG_SRCDIR([champlain-gtk/champlain-view-embed.h])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE