From: Pierre-Luc Beaudoin Date: Sat, 18 Oct 2008 14:18:39 +0000 (-0400) Subject: 1.0 left overs X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee08a9a40716e3d811bab414e487b7adba5330a;p=libchamplain 1.0 left overs --- diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am index f673527..ba3b675 100644 --- a/champlain-gtk/Makefile.am +++ b/champlain-gtk/Makefile.am @@ -24,7 +24,7 @@ champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST) champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST) @GLIB_GENMARSHAL@ --body --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).c -libchamplain_includedir=$(includedir)/libchamplain-gtk-1.0/champlain-gtk +libchamplain_includedir=$(includedir)/libchamplain-gtk-0.2/champlain-gtk libchamplain_include_HEADERS = champlain-gtk.h champlainviewembed.h libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index fdc06b2..c14c422 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -62,7 +62,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir)/champlain -I$(top_srcdir) -I$(top_builddir) $(DEPS_CFLAGS) -GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain-gtk/libchamplain-gtk-1.0.la +GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain-gtk/libchamplain-gtk-0.2.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make