better support for external plugins

diff --git a/Makefile.am b/Makefile.am
index 16983622315f85a5a93c5d8ee70dd90239eee07e..d937d7673496c81867efb6e4821dfd5705405e03 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
 SUBDIRS = src data docs
 
+ACLOCAL_AMFLAGS=-I m4
+
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.h.in config.sub \
                       configure depcomp gtk-doc.make install-sh ltmain.sh \
                       Makefile.in missing
 
-
-ACLOCAL_AMFLAGS=-I m4
-
 test: all
        (cd src && make test)
 

diff --git a/configure.ac b/configure.ac
index 0d2d33d618d6b684053d6926fcc508e65e552e93..4e8929ee4ffcc9fbe7fbf1246e01bac18b1fc7e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_CONFIG_FILES([
        Makefile
        src/Makefile
        src/gis/Makefile
+       src/gis/libgis.pc
        src/plugins/Makefile
        data/Makefile
        docs/Makefile

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index be6ed5b94ea753fe8d0e0ab62a126dd15b91a731..93d9e947447f82228c64082f2fe46d65b5087b04 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -536,6 +536,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
        GtkWidget *body   = gis_plugin_get_config(plugin);
        gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
        gtk_widget_show_all(config);
+       gis_opengl_redraw(self->opengl);
 }
 void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
 {
@@ -552,4 +553,5 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
                        gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
        }
        gis_plugins_unload(self->plugins, name);
+       gis_opengl_redraw(self->opengl);
 }

diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 786be0073513d76f8f008d5ce51d324cb0ad7c99..5dc04a53e183b122f5271408596fbcf6a73d47b1 100644 (file)
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -22,6 +22,9 @@ libgis_la_SOURCES = \
 libgis_la_CPPFLAGS = -DPLUGINDIR="\"$(libdir)/gis\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 libgis_la_LIBADD = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.pc
+
 MAINTAINERCLEANFILES = Makefile.in
 
 .list.c:

diff --git a/src/gis/gis-opengl.h b/src/gis/gis-opengl.h
index e8149692af132eaf7f07fb83d2e6b58c07529cb1..ee753a7c91129b09ca1994791098c33568b2b340 100644 (file)
--- a/src/gis/gis-opengl.h
+++ b/src/gis/gis-opengl.h
@@ -18,7 +18,6 @@
 #ifndef __GIS_OPENGL_H__
 #define __GIS_OPENGL_H__
 
-#include <config.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <glib-object.h>

diff --git a/src/gis/gis.h b/src/gis/gis.h
index be6cbc312775729580a76c11511cd0e0926ac59c..772c2397bca25945ccf37435112bc23267b0869d 100644 (file)
--- a/src/gis/gis.h
+++ b/src/gis/gis.h
@@ -26,7 +26,6 @@
 
 /* GIS helprs */
 #include "gis-data.h"
-#include "gis-marshal.h"
 
 /* Plugins */
 #include "gis-plugin.h"

diff --git a/src/gis/libgis.pc.in b/src/gis/libgis.pc.in
new file mode 100644 (file)
index 0000000..859289e
--- /dev/null
+++ b/src/gis/libgis.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libgis
+Description: GIS Library for Gtk+ applications
+Version: @VERSION@
+Requires: gmodule-2.0 gtk+-2.0 gtkglext-1.0 libsoup-2.4
+Libs: -L${libdir} -lgis
+Cflags: -I${includedir}/gis