Improve library install

diff --git a/champlain.pc.in b/champlain.pc.in
index de926d54a8b8a022eecb5541870d6f95b1b75fa3..4eb2d34b1d9f193470810abcf9e2cb44d2a159f9 100644 (file)
--- a/champlain.pc.in
+++ b/champlain.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: Champlain
 Description: Map View for Gtk+

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 07112c5bd08491b22a25fee14147e238f905a211..d4d0f621ca02d1ead4eb9821dd1c46c014d9fb7f 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -19,7 +19,7 @@ SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -36,8 +36,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.h
+HFILE_GLOB=
+CFILE_GLOB=
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -61,8 +61,8 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(DEPS_CFLAGS)
+GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

diff --git a/docs/reference/libchamplain.types b/docs/reference/libchamplain.types
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4fb903be6ac1dfdd2be077018b4b22499c51fc67 100644 (file)
--- a/docs/reference/libchamplain.types
+++ b/docs/reference/libchamplain.types
@@ -0,0 +1,3 @@
+#include <champlain.h>
+
+champlain_view_get_type

diff --git a/src/Makefile.am b/src/Makefile.am
index f5a5942500010007122bebc15026b71796d3dbcb..816bc8cf276ceadb8628331dba88ad2207965d82 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,26 +10,16 @@ CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list
 
 lib_LTLIBRARIES = libchamplain-1.0.la
 
-bin_PROGRAMS = launcher
-
-nodist_libchamplain_1_0_la_SOURCES = \
-        $(BUILT_SOURCES)
-
-launcher_SOURCES = launcher.c
-launcher_LDADD = $(DEPS_LIBS) libchamplain-1.0.la
-
 libchamplain_1_0_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
+                                       $(BUILT_SOURCES) \
                                        champlainview.c \
                                        map.c  \
                                        zoomlevel.c \
                                        tile.c \
                                        sources/openstreetmap.c \
                                        sources/debugmap.c 
-                                       
 
 libchamplain_1_0_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I../tidy
-
 
 EXTRA_DIST = $(CHAMPLAIN_MARSHAL_LIST)
         
@@ -39,3 +29,20 @@ champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
 champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --body --prefix=champlain_marshal $< > $(CHAMPLAIN_MARSHAL).c
 
+libchamplain_includedir=$(includedir)/libchamplain-1.0/champlain
+libchamplain_include_HEADERS = champlain.h
+
+libchamplain_configdir = $(libdir)/libchamplain-1.0/champlain
+libchamplain_config_DATA = ../config.h
+
+RELEASE=0:1:0
+LIBRARY_VERSION=0:1:0
+
+libchamplain_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION) -release $(RELEASE)
+
+noinst_PROGRAMS = launcher
+
+AM_CPPFLAGS = $(DEPS_CFLAGS) -I../tidy
+AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic 
+SOURCES = launcher.c
+LDADD = $(DEPS_LIBS) $(top_builddir)/src/libchamplain-1.0.la

diff --git a/src/champlainview.c b/src/champlainview.c
index d9bcff3bfef69e5059fde4ad80b0bc209227b246..bb8b2add45d081c7442fd4e531b44369205c5a90 100644 (file)
--- a/src/champlainview.c
+++ b/src/champlainview.c
@@ -40,7 +40,6 @@
 enum
 {
   /* normal signals */
-  TBD,
   LAST_SIGNAL
 };
 
@@ -165,7 +164,6 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass)
   objectClass->get_property = champlain_view_get_property;
   objectClass->set_property = champlain_view_set_property;
   
-  
   /**
   * ChamplainView:longitude:
   *
@@ -238,7 +236,8 @@ champlain_view_init (ChamplainView *champlainView)
   ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
 }
 
-void viewport_x_changed_cb(GObject    *gobject,
+static void 
+viewport_x_changed_cb(GObject    *gobject,
                            GParamSpec *arg1,
                            ChamplainView *champlainView)
 {
@@ -257,6 +256,9 @@ void viewport_x_changed_cb(GObject    *gobject,
   priv->viewportSize.y = rect.y;
   
   map_load_visible_tiles (priv->map, priv->viewportSize);
+  
+  g_object_notify(G_OBJECT(champlainView), "longitude");
+  g_object_notify(G_OBJECT(champlainView), "latitude");
 }
 
 static void
@@ -370,6 +372,9 @@ champlain_view_center_on (ChamplainView *champlainView, gdouble longitude, gdoub
   y = priv->map->latitude_to_y(priv->map, latitude, priv->map->current_level->level);
 
   tidy_viewport_set_origin(TIDY_VIEWPORT(priv->viewport), x - priv->viewportSize.width/2.0, y - priv->viewportSize.height/2.0, 0);
+  
+  g_object_notify(G_OBJECT(champlainView), "longitude");
+  g_object_notify(G_OBJECT(champlainView), "latitude");
 }
 
 /**
@@ -400,6 +405,8 @@ champlain_view_zoom_in (ChamplainView *champlainView)
       clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
       
       tidy_viewport_set_origin(TIDY_VIEWPORT(priv->viewport), x - priv->viewportSize.width/2.0, y - priv->viewportSize.height/2.0, 0);
+      
+      g_object_notify(G_OBJECT(champlainView), "zoom-level");
     }
 }
 
@@ -431,5 +438,7 @@ champlain_view_zoom_out (ChamplainView *champlainView)
       clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
       
       tidy_viewport_set_origin(TIDY_VIEWPORT(priv->viewport), x - priv->viewportSize.width/2.0, y - priv->viewportSize.height/2.0, 0);
+      
+      g_object_notify(G_OBJECT(champlainView), "zoom-level");
     }
 }

diff --git a/src/champlainview.h b/src/champlainview.h
index 94508a3ad6b8f002853756dc4116c0ceb8146748..3ddebb5cd35179cffdb15263013dfb89642c00ed 100644 (file)
--- a/src/champlainview.h
+++ b/src/champlainview.h
@@ -62,4 +62,6 @@ CHAMPLAIN_API void champlain_view_center_on (ChamplainView *view, gdouble longit
 
 CHAMPLAIN_API void champlain_view_zoom_in (ChamplainView *champlainView);
 
+CHAMPLAIN_API void champlain_view_zoom_out (ChamplainView *champlainView);
+
 #endif

diff --git a/tidy/Makefile.am b/tidy/Makefile.am
index 67a5161cb71ca0288c752bae3170677443bf9775..661c905c4810e7e198dfa19f94844d84fa992bda 100644 (file)
--- a/tidy/Makefile.am
+++ b/tidy/Makefile.am
@@ -83,8 +83,9 @@ tidy-enum-types.c: stamp-tidy-enum-types.h tidy-enum-types.c.in
          $(source_h) ) >> xgen-tetc && \
        cp xgen-tetc tidy-enum-types.c && \
        rm -f xgen-tetc
-
-lib_LTLIBRARIES = libtidy-1.0.la
+       
+noinst_libdir = $(top_srcdir)/tidy
+noinst_LTLIBRARIES = libtidy-1.0.la
 
 libtidy_1_0_la_LIBADD = $(DEPS_LIBS)
 libtidy_1_0_la_SOURCES = \
@@ -95,16 +96,8 @@ libtidy_1_0_la_SOURCES = \
        $(NULL)
 libtidy_1_0_la_LDFLAGS = $(TIDY_LT_LDFLAGS)
 
-tidyincludedir = $(includedir)/tidy-1.0/tidy
-tidyinclude_DATA = \
-       $(source_h) \
-       $(top_srcdir)/tidy/tidy-enum-types.h \
-       $(NULL)
-
 CLEANFILES = $(STAMP_FILES) $(BUILT_SOURCES)
 
-DISTCLEANFILES = tidy-version.h
-
 EXTRA_DIST = \
        tidy-enum-types.h.in \
        tidy-enum-types.c.in \