[libgweather] Weather: move weather.h to gweather-weather.h



commit c92d71b772c23b8dcdaf1e5baea8a1bba890c4da
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Dec 14 16:02:49 2011 +0100

    Weather: move weather.h to gweather-weather.h
    
    Public headers should have a namespaced name, and should also be
    installed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=587017

 libgweather/Makefile.am                       |    7 ++++---
 libgweather/{weather.h => gweather-weather.h} |    0
 libgweather/gweather-xml.h                    |    2 +-
 libgweather/weather-bom.c                     |    1 -
 libgweather/weather-iwin.c                    |    1 -
 libgweather/weather-met.c                     |    1 -
 libgweather/weather-metar.c                   |    1 -
 libgweather/weather-priv.h                    |    2 +-
 libgweather/weather-wx.c                      |    1 -
 libgweather/weather.c                         |    2 +-
 10 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/libgweather/Makefile.am b/libgweather/Makefile.am
index ae6511c..233a029 100644
--- a/libgweather/Makefile.am
+++ b/libgweather/Makefile.am
@@ -18,12 +18,13 @@ libgweatherincdir = $(includedir)/libgweather-3.0/libgweather
 libgweatherinc_HEADERS = \
 	$(gweather_old_headers)		\
 	$(gweather_new_headers)		\
+	gweather-weather.h		\
 	gweather-enum-types.h
 
 noinst_HEADERS = weather-priv.h gweather-win32.h
 
 libgweather_3_la_SOURCES = \
-	weather.c weather.h weather-priv.h \
+	weather.c weather-priv.h \
 	weather-metar.c weather-iwin.c weather-met.c \
 	weather-bom.c weather-wx.c \
 	weather-sun.c weather-moon.c \
@@ -79,7 +80,7 @@ gweather-enum-types.h: $(gweather_new_headers)
 	&& mv gweather-enum-types.h.tmp gweather-enum-types.h \
 	|| rm -f gweather-enum-type.h.tmp
 
-gweather-enum-types.c: $(libgweatherinclude_HEADERS)
+gweather-enum-types.c: $(gweather_new_headers)
 	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gweather-enum-types.c.tmpl \
 		$(gweather_new_headers) ) > gweather-enum-types.c.tmp \
 	&& mv gweather-enum-types.c.tmp gweather-enum-types.c \
@@ -104,7 +105,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
 introspection_sources = 	\
-	weather.c weather.h \
+	weather.c gweather-weather.h \
 	gweather-location.c gweather-location.h \
 	gweather-timezone.c gweather-timezone.h \
 	location-entry.c location-entry.h \
diff --git a/libgweather/weather.h b/libgweather/gweather-weather.h
similarity index 100%
rename from libgweather/weather.h
rename to libgweather/gweather-weather.h
diff --git a/libgweather/gweather-xml.h b/libgweather/gweather-xml.h
index 49d61c6..b3573e6 100644
--- a/libgweather/gweather-xml.h
+++ b/libgweather/gweather-xml.h
@@ -22,7 +22,7 @@
 #define __GWEATHER_XML_H__
 
 #include <gtk/gtk.h>
-#include <libgweather/weather.h>
+#include <libgweather/gweather-weather.h>
 
 enum
 {
diff --git a/libgweather/weather-bom.c b/libgweather/weather-bom.c
index 9636d8f..a556bda 100644
--- a/libgweather/weather-bom.c
+++ b/libgweather/weather-bom.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
 #include "weather-priv.h"
 
 static void
diff --git a/libgweather/weather-iwin.c b/libgweather/weather-iwin.c
index 09a4374..fd2495d 100644
--- a/libgweather/weather-iwin.c
+++ b/libgweather/weather-iwin.c
@@ -27,7 +27,6 @@
 #include <libxml/parser.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
 #include "weather-priv.h"
 
 /**
diff --git a/libgweather/weather-met.c b/libgweather/weather-met.c
index 0057413..9141f86 100644
--- a/libgweather/weather-met.c
+++ b/libgweather/weather-met.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
 #include "weather-priv.h"
 
 static char *
diff --git a/libgweather/weather-metar.c b/libgweather/weather-metar.c
index 83e8cf2..6048067 100644
--- a/libgweather/weather-metar.c
+++ b/libgweather/weather-metar.c
@@ -26,7 +26,6 @@
 #include <regex.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
 #include "weather-priv.h"
 
 enum {
diff --git a/libgweather/weather-priv.h b/libgweather/weather-priv.h
index cb02331..8a910f7 100644
--- a/libgweather/weather-priv.h
+++ b/libgweather/weather-priv.h
@@ -31,7 +31,7 @@
 #include <libsoup/soup.h>
 #endif
 
-#include "weather.h"
+#include "gweather-weather.h"
 #include "gweather-location.h"
 
 #ifdef _WIN32
diff --git a/libgweather/weather-wx.c b/libgweather/weather-wx.c
index 67586d0..8ff75bc 100644
--- a/libgweather/weather-wx.c
+++ b/libgweather/weather-wx.c
@@ -21,7 +21,6 @@
 #endif
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
 #include "weather-priv.h"
 
 static void
diff --git a/libgweather/weather.c b/libgweather/weather.c
index 31f1b6e..7135ad8 100644
--- a/libgweather/weather.c
+++ b/libgweather/weather.c
@@ -38,7 +38,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include "weather.h"
+#include "gweather-weather.h"
 #include "weather-priv.h"
 #include "gweather-enum-types.h"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]