From: Kaj-Michael Lang Date: Thu, 22 May 2008 07:36:55 +0000 (+0300) Subject: MapWidget: Move from src/* to libs/libgtkmap/* X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f759d033c35032319dfc9e75f5644401856ed1f8;p=mapper MapWidget: Move from src/* to libs/libgtkmap/* Build: Start to add gtk-doc support --- diff --git a/Makefile.am b/Makefile.am index 90eced3..455657f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,8 @@ EXTRA_DIST = \ debian/rules \ debian/mapper.links -SUBDIRS = src data po +SUBDIRS = libs src data po + +DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc CLEANFILES = intltool-extract intltool-merge intltool-update diff --git a/autogen.sh b/autogen.sh index 1b2bb1d..5297c38 100755 --- a/autogen.sh +++ b/autogen.sh @@ -24,6 +24,7 @@ set -x glib-gettextize --copy --force libtoolize --automake --copy --force intltoolize --automake --copy --force +gtkdocize --copy aclocal-1.7 autoconf --force autoheader --force diff --git a/configure.ac b/configure.ac index 07ae533..66c9632 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ AC_INIT(Makefile.am) AM_INIT_AUTOMAKE(mapper, 1.0.3.95) +AC_CONFIG_MACRO_DIR(m4) AM_MAINTAINER_MODE AC_PROG_CPP @@ -114,6 +115,8 @@ AC_ARG_ENABLE([cairo],AS_HELP_STRING([--enable-cairo],[Use cairo]), AC_ARG_ENABLE([opengl],AS_HELP_STRING([--enable-opengl],[Use OpenGL (gtkglext]), [enable_opengl=$enableval], [enable_opengl=no]) +GTK_DOC_CHECK(1.9) + if test "x$enable_cairo" = "xyes" ; then PKG_CHECK_MODULES(CAIRO, cairo) AC_SUBST(CAIRO_LIBS) @@ -447,8 +450,10 @@ AC_DEFINE_UNQUOTED([LOCALEDIR], "${localedir}", [Runtime locale catalog files pa AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path]) # Produce output files -AC_OUTPUT( - Makefile \ +AC_OUTPUT(Makefile \ + libs/Makefile \ + libs/libgtkgps/Makefile \ + libs/libgtkmap/Makefile \ src/Makefile \ data/Makefile \ data/help/Makefile \ diff --git a/src/gtkmap-marshal.list b/libs/libgtkmap/gtkmap-marshal.list similarity index 100% rename from src/gtkmap-marshal.list rename to libs/libgtkmap/gtkmap-marshal.list diff --git a/src/gtkmap.c b/libs/libgtkmap/gtkmap.c similarity index 100% rename from src/gtkmap.c rename to libs/libgtkmap/gtkmap.c diff --git a/src/gtkmap.h b/libs/libgtkmap/gtkmap.h similarity index 100% rename from src/gtkmap.h rename to libs/libgtkmap/gtkmap.h diff --git a/src/map-widget-test.c b/libs/libgtkmap/map-widget-test.c similarity index 100% rename from src/map-widget-test.c rename to libs/libgtkmap/map-widget-test.c diff --git a/src/Makefile.am b/src/Makefile.am index 97bacfd..15e3021 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,9 +19,9 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE +INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE -I../libs/libgtkmap/ -bin_PROGRAMS = mapper osm2db map_widget_test +bin_PROGRAMS = mapper osm2db mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) \ $(OSSO_CFLAGS) $(CONIC_CFLAGS) \ @@ -41,7 +41,7 @@ mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) \ $(SQLITE_LIBS) $(LIBCURL_LIBS) \ $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) \ $(GYPSY_LIBS) $(LIBGPSBT_LIBS) $(HAL_LIBS)\ - -lm libgtkgps.la libosmdb.la libmappergps.la libgtkmap.la + -lm libgtkgps.la libosmdb.la libmappergps.la ../libs/libgtkmap/libgtkmap.la mapper_SOURCES = \ announcements.c \ @@ -118,7 +118,7 @@ osm2db_CFLAGS = $(EXPAT_CFLAGS) $(SQLITE_CFLAGS) $(GLIBGTK_CFLAGS) osm2db_LDADD = $(EXPAT_LIBS) $(SQLITE_LIBS) $(GLIBGTK_LIBS) -lm libosmdb.la osm2db_SOURCES = osm.c osm.h -lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la libgtkmap.la +lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la libmappergps_la_SOURCES = \ bluetooth-scan.h \ @@ -150,15 +150,6 @@ libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAG libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS) endif -libgtkmap_la_SOURCES = gtkmap.c gtkmap.h gtkmap-marshal.c gtkmap-marshal.h -libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(defines) -libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GTKGLEXT_LIBS) -libgtkmap_la_LDFLAGS = -lm -no-undefined - -map_widget_test_SOURCES = map-widget-test.c latlon.c image-cache.c map-tile-repo.c -map_widget_test_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) -lm libgtkgps.la libgtkmap.la -map_widget_test_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) - libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c \ gtkgps.h gtkcompass.h gpsdata.h libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) @@ -172,7 +163,7 @@ libosmdb_la_CFLAGS = $(GLIBGTK_CFLAGS) $(SQLITE_CFLAGS) $(defines) libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS) $(BZ2_LIBS) libosmdb_la_LDFLAGS = -lm -no-undefined -EXTRA_DIST = gps-bluetooth-maemo-marshal.list gps-bluetooth-bluez-marshal.list gtkmap-marshal.list +EXTRA_DIST = gps-bluetooth-maemo-marshal.list gps-bluetooth-bluez-marshal.list BUILT_SOURCES = gps-bluetooth-maemo-marshal.h gps-bluetooth-maemo-marshal.c \ gps-bluetooth-bluez-marshal.h gps-bluetooth-bluez-marshal.c @@ -189,10 +180,4 @@ gps-bluetooth-bluez-marshal.h: gps-bluetooth-bluez-marshal.list gps-bluetooth-bluez-marshal.c: gps-bluetooth-bluez-marshal.list glib-genmarshal --prefix _bt_bluez --body $< > $@ -gtkmap-marshal.c: gtkmap-marshal.list - glib-genmarshal --prefix _gtkamp --body $< > $@ - -gtkmap-marshal.h: gtkmap-marshal.list - glib-genmarshal --prefix _gtkamp --header $< > $@ - CLEANFILES = $(BUILT_SOURCES)