From: Pierre-Luc Beaudoin Date: Thu, 16 Oct 2008 15:24:03 +0000 (-0400) Subject: Fix file naming conviention X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=704713555489348b6c2f46cf2b3f44d02b58dbe6;p=libchamplain Fix file naming conviention --- diff --git a/champlain/Makefile.am b/champlain/Makefile.am index 663ab7a..518cf65 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -19,25 +19,25 @@ libchamplain_0_2_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \ zoomlevel.c \ tile.c \ sources/oam.c \ - sources/osm_mapnik.c \ - sources/mff_relief.c \ - sources/google_map.c \ - sources/google_sat.c \ - sources/google_terrain.c \ + sources/osmmapnik.c \ + sources/mffrelief.c \ + sources/googlemap.c \ + sources/googlesat.c \ + sources/googleterrain.c \ sources/debugmap.c noinst_HEADERS = champlainview.h \ champlainmarker.c \ - champlain_private.h \ + champlainprivate.h \ map.h \ zoomlevel.h \ tile.h \ sources/oam.h \ - sources/osm_mapnik.h \ - sources/mff_relief.h \ - sources/google_map.h \ - sources/google_sat.h \ - sources/google_terrain.h \ + sources/osmmapnik.h \ + sources/mffrelief.h \ + sources/googlemap.h \ + sources/googlesat.h \ + sources/googleterrain.h \ sources/debugmap.h libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la @@ -49,7 +49,7 @@ champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST) @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain -libchamplain_include_HEADERS = champlain.h champlainview.h champlain_defines.h champlainlayer.h champlainmarker.h +libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h champlainlayer.h champlainmarker.h libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION) diff --git a/champlain/champlain.h b/champlain/champlain.h index 3ab807b..cdaf714 100644 --- a/champlain/champlain.h +++ b/champlain/champlain.h @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/champlain/champlain_defines.h b/champlain/champlaindefines.h similarity index 100% rename from champlain/champlain_defines.h rename to champlain/champlaindefines.h diff --git a/champlain/champlainlayer.c b/champlain/champlainlayer.c index 4aec98e..bfe9ae7 100644 --- a/champlain/champlainlayer.c +++ b/champlain/champlainlayer.c @@ -19,7 +19,7 @@ #include "config.h" #include "champlainlayer.h" -#include "champlain_defines.h" +#include "champlaindefines.h" #include #include diff --git a/champlain/champlainlayer.h b/champlain/champlainlayer.h index a8e924e..99c4a91 100644 --- a/champlain/champlainlayer.h +++ b/champlain/champlainlayer.h @@ -19,7 +19,7 @@ #ifndef CHAMPLAIN_LAYER_H #define CHAMPLAIN_LAYER_H -#include +#include #include #include diff --git a/champlain/champlainmarker.c b/champlain/champlainmarker.c index 84877b7..423df8f 100644 --- a/champlain/champlainmarker.c +++ b/champlain/champlainmarker.c @@ -18,9 +18,9 @@ #include "config.h" -#include "champlain_defines.h" +#include "champlaindefines.h" #include "champlainmarker.h" -#include "champlain_private.h" +#include "champlainprivate.h" #include "champlain.h" #include "champlain-marshal.h" #include "map.h" diff --git a/champlain/champlainmarker.h b/champlain/champlainmarker.h index ac2a19f..badb41d 100644 --- a/champlain/champlainmarker.h +++ b/champlain/champlainmarker.h @@ -19,7 +19,7 @@ #ifndef CHAMPLAIN_MARKER_H #define CHAMPLAIN_MARKER_H -#include +#include #include #include diff --git a/champlain/champlain_private.h b/champlain/champlainprivate.h similarity index 100% rename from champlain/champlain_private.h rename to champlain/champlainprivate.h diff --git a/champlain/champlainview.c b/champlain/champlainview.c index 743ec23..082b220 100644 --- a/champlain/champlainview.c +++ b/champlain/champlainview.c @@ -18,8 +18,8 @@ #include "config.h" -#include "champlain_defines.h" -#include "champlain_private.h" +#include "champlaindefines.h" +#include "champlainprivate.h" #include "champlain.h" #include "champlain-marshal.h" #include "champlainview.h" diff --git a/champlain/champlainview.h b/champlain/champlainview.h index b463beb..581c1a8 100644 --- a/champlain/champlainview.h +++ b/champlain/champlainview.h @@ -19,7 +19,7 @@ #ifndef CHAMPLAIN_VIEW_H #define CHAMPLAIN_VIEW_H -#include +#include #include #include #include diff --git a/champlain/map.c b/champlain/map.c index 74fda79..a7ddf3f 100644 --- a/champlain/map.c +++ b/champlain/map.c @@ -18,8 +18,8 @@ #include "map.h" #include "zoomlevel.h" -#include "sources/osm_mapnik.h" -#include "sources/mff_relief.h" +#include "sources/osmmapnik.h" +#include "sources/mffrelief.h" #include "sources/oam.h" #include "sources/debugmap.h" #include diff --git a/champlain/map.h b/champlain/map.h index 487844c..e52c815 100644 --- a/champlain/map.h +++ b/champlain/map.h @@ -21,7 +21,7 @@ #include "champlain.h" #include "champlainview.h" -#include "champlain_private.h" +#include "champlainprivate.h" #include "zoomlevel.h" #include "tile.h" diff --git a/champlain/sources/google_map.c b/champlain/sources/googlemap.c similarity index 99% rename from champlain/sources/google_map.c rename to champlain/sources/googlemap.c index 3f5e1f9..a111e63 100644 --- a/champlain/sources/google_map.c +++ b/champlain/sources/googlemap.c @@ -22,7 +22,7 @@ * The current code isn't working because the web server is returning Forbiden error message. */ -#include "sources/google_map.h" +#include "sources/googlemap.h" #include "map.h" #include #include diff --git a/champlain/sources/google_map.h b/champlain/sources/googlemap.h similarity index 100% rename from champlain/sources/google_map.h rename to champlain/sources/googlemap.h diff --git a/champlain/sources/google_sat.c b/champlain/sources/googlesat.c similarity index 99% rename from champlain/sources/google_sat.c rename to champlain/sources/googlesat.c index 8290eba..31d172e 100644 --- a/champlain/sources/google_sat.c +++ b/champlain/sources/googlesat.c @@ -22,7 +22,7 @@ * The current code isn't working because the web server is returning Forbiden error message. */ -#include "sources/google_sat.h" +#include "sources/googlesat.h" #include "map.h" #include #include diff --git a/champlain/sources/google_sat.h b/champlain/sources/googlesat.h similarity index 100% rename from champlain/sources/google_sat.h rename to champlain/sources/googlesat.h diff --git a/champlain/sources/google_terrain.c b/champlain/sources/googleterrain.c similarity index 99% rename from champlain/sources/google_terrain.c rename to champlain/sources/googleterrain.c index 8d1937b..8f9524a 100644 --- a/champlain/sources/google_terrain.c +++ b/champlain/sources/googleterrain.c @@ -22,7 +22,7 @@ * The current code isn't working because the web server is returning Forbiden error message. */ -#include "sources/google_terrain.h" +#include "sources/googleterrain.h" #include "map.h" #include #include diff --git a/champlain/sources/google_terrain.h b/champlain/sources/googleterrain.h similarity index 100% rename from champlain/sources/google_terrain.h rename to champlain/sources/googleterrain.h diff --git a/champlain/sources/mff_relief.c b/champlain/sources/mffrelief.c similarity index 99% rename from champlain/sources/mff_relief.c rename to champlain/sources/mffrelief.c index 89dee58..6956a2e 100644 --- a/champlain/sources/mff_relief.c +++ b/champlain/sources/mffrelief.c @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "sources/mff_relief.h" +#include "sources/mffrelief.h" #include "map.h" #include #include diff --git a/champlain/sources/mff_relief.h b/champlain/sources/mffrelief.h similarity index 100% rename from champlain/sources/mff_relief.h rename to champlain/sources/mffrelief.h diff --git a/champlain/sources/osm_mapnik.c b/champlain/sources/osmmapnik.c similarity index 99% rename from champlain/sources/osm_mapnik.c rename to champlain/sources/osmmapnik.c index 5899089..7ea393a 100644 --- a/champlain/sources/osm_mapnik.c +++ b/champlain/sources/osmmapnik.c @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "sources/osm_mapnik.h" +#include "sources/osmmapnik.h" #include "map.h" #include #include diff --git a/champlain/sources/osm_mapnik.h b/champlain/sources/osmmapnik.h similarity index 100% rename from champlain/sources/osm_mapnik.h rename to champlain/sources/osmmapnik.h diff --git a/champlain/tile.c b/champlain/tile.c index 935f2f4..5302497 100644 --- a/champlain/tile.c +++ b/champlain/tile.c @@ -18,7 +18,7 @@ #include "tile.h" #include "map.h" -#include "champlain_private.h" +#include "champlainprivate.h" #include #include diff --git a/champlain/tile.h b/champlain/tile.h index b473f96..e92e33e 100644 --- a/champlain/tile.h +++ b/champlain/tile.h @@ -21,7 +21,7 @@ #include #include -#include +#include struct _Tile { diff --git a/champlain/zoomlevel.h b/champlain/zoomlevel.h index 1b33e25..7c9ab74 100644 --- a/champlain/zoomlevel.h +++ b/champlain/zoomlevel.h @@ -21,7 +21,7 @@ #include #include -#include "champlain_private.h" +#include "champlainprivate.h" typedef struct {