Automake and GCC fixes

diff --git a/src/Makefile.am b/src/Makefile.am
index d5e5fac0cbc01dc8bc1e37d3966deca1e44d2eb7..01465d4a8258279f2acc8510981fb6c36cb0b023 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,18 @@
 SUBDIRS = gis plugins
 
-AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
+AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99 
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
        aweather-gui.c      aweather-gui.h \
        aweather-location.c aweather-location.h
-aweather_CPPFLAGS = -DDATADIR="\"$(datadir)\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-aweather_LDADD    = gis/libgis.la $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+aweather_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR="\"$(datadir)\""
+aweather_LDADD    = $(AM_LDADD) gis/libgis.la
 
-wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDFLAGS = -lbz2
+wsr88ddec       = wsr88ddec.c
+wsr88ddec_LDADD = -lbz2
 
 CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 67a90ddc24ba9ab17527092a6200dc1dad9ad774..c9fefe7cd031fa773abacad85ce2f35233b87817 100644 (file)
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -1,4 +1,6 @@
-AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
+AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99 
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 
 # Library
 BUILT_SOURCES = gis-marshal.c gis-marshal.h
@@ -23,11 +25,9 @@ libgis_la_SOURCES = \
        roam.c        roam.h        \
        wms.c         wms.h         \
        gpqueue.c     gpqueue.h
-libgis_la_CPPFLAGS = \
-       -DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\"" \
-       $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-libgis_la_LIBADD = \
-       $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
+       -DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\""
+libgis_la_LIBADD = $(AM_LDADD)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
@@ -36,12 +36,10 @@ pkgconfig_DATA = libgis.pc
 bin_PROGRAMS = gis_test wms_test
 
 gis_test_SOURCES  = gis_test.c gis.h
-gis_test_CPPFLAGS = $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-gis_test_LDADD    = libgis.la $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+gis_test_LDADD    = $(AM_LDADD) libgis.la
 
 wms_test_SOURCES  = wms_test.c gis-world.c gis-world.h wms.c wms.h
-wms_test_CPPFLAGS = $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-wms_test_LDADD    = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+wms_test_LDADD    = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in
 

diff --git a/src/gis/wms.c b/src/gis/wms.c
index aa54444593b1d264b41597c41a6d0565114e72e7..f62928de6d31c9c32f4ed8c12c4bce8799c0b1b2 100644 (file)
--- a/src/gis/wms.c
+++ b/src/gis/wms.c
@@ -457,7 +457,8 @@ WmsInfo *wms_info_new_for_bmng(WmsLoader loader, WmsFreeer freeer)
 void srtm_bil_loader(WmsCacheNode *node, const gchar *path, gint width, gint height)
 {
        WmsBil *bil = g_new0(WmsBil, 1);
-       g_file_get_contents(path, (gchar**)&bil->data, NULL, NULL);
+       gchar **char_data = (gchar**)&bil->data;
+       g_file_get_contents(path, char_data, NULL, NULL);
        bil->width  = width;
        bil->height = height;
        node->data = bil;
@@ -476,8 +477,9 @@ void srtm_pixbuf_loader(WmsCacheNode *node, const gchar *path, gint width, gint
        guchar    *pixels = gdk_pixbuf_get_pixels(pixbuf);
        gint       stride = gdk_pixbuf_get_rowstride(pixbuf);
 
-       gint16 *data;
-       g_file_get_contents(path, (gchar**)&data, NULL, NULL);
+       gint16 *data; 
+       gchar **char_data = (gchar**)char_data; 
+       g_file_get_contents(path, char_data, NULL, NULL);
        for (int r = 0; r < height; r++) {
                for (int c = 0; c < width; c++) {
                        gint16 value = data[r*width + c];

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7db3716f117e75d5221d616c4fe9e4414a800427..ca4b078ff62916bb60111d8fc39d01587ca978cf 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99  -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-AM_LDFLAGS  = -module $(GLIB_LIBS) $(GTK_LIBS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version
 
 plugindir = $(libdir)/gis
 
@@ -9,17 +9,14 @@ plugin_LTLIBRARIES = \
        radar.la   \
        ridge.la
 
-example_la_SOURCES  = example.c example.h
-example_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+example_la_SOURCES = example.c example.h
 
-ridge_la_SOURCES    = ridge.c ridge.h
-ridge_la_CPPFLAGS   = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+ridge_la_SOURCES   = ridge.c   ridge.h
 
-radar_la_SOURCES = \
-       radar.c    radar.h \
+radar_la_SOURCES   = radar.c   radar.h \
        marching.c marching.h \
        radar-colormap.c
-radar_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS) $(RSL_CFLAGS)
-radar_la_LIBADD = $(SOUP_LIBS) $(RSL_LIBS)
+radar_la_CPPFLAGS = $(RSL_CFLAGS) $(AM_CPPFLAGS) 
+radar_la_LIBADD   = $(RSL_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in