Fix misc bugs and bump version to 0.3

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ff7181c38a544c5ea7d82bc573a88c93a2ff71e2..70ebf3c8c05e5630e291d4fd4e238e5b6b8181bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = . plugins
+
 AM_CFLAGS   = -Wall --std=gnu99 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
@@ -14,9 +16,10 @@ gis_include_HEADERS = \
        gis-opengl.h  \
        gis-plugin.h  \
        gis-data.h    \
+       gis-tile.h    \
+       gis-wms.h     \
        gpqueue.h     \
-       roam.h        \
-       wms.h
+       roam.h
 libgis_la_SOURCES = \
        gis-world.c   gis-world.h   \
        gis-view.c    gis-view.h    \
@@ -25,8 +28,9 @@ libgis_la_SOURCES = \
        gis-plugin.c  gis-plugin.h  \
        gis-marshal.c gis-marshal.h \
        gis-data.c    gis-data.h    \
+       gis-tile.c    gis-tile.h    \
+       gis-wms.c     gis-wms.h     \
        roam.c        roam.h        \
-       wms.c         wms.h         \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
@@ -42,7 +46,7 @@ gis_test_SOURCES  = gis_test.c gis.h
 gis_test_LDFLAGS  = -static
 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_SOURCES  = wms_test.c gis-world.c gis-world.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
 wms_test_LDADD    = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -52,23 +56,25 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
        glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
-test: all
+test: all .libs/gis
        ./gis_test
 
-gdb: all
-       LD_LIBRARY_PATH=.libs gdb .libs/gis_test
+gdb: all .libs/gis
+       gdb ./gis_test
+
+ddd: all .libs/gis
+       ddd ./gis_test
 
-ddd: all
-       LD_LIBRARY_PATH=.libs ddd .libs/gis_test
+.libs/gis: plugins/.libs
+       ln -sf ../plugins/.libs .libs/gis
 
 memcheck: all
-       LD_LIBRARY_PATH=.libs                      \
-       G_SLICE=always-malloc                      \
-       G_DEBUG=gc-friendly,resident-modules       \
-       valgrind --track-origins=yes               \
-                --leak-check=full                 \
-                --leak-resolution=high            \
-                --num-callers=100                 \
-                --suppressions=../gtk.suppression \
-                .libs/gis_test                    \
+       G_SLICE=always-malloc                   \
+       G_DEBUG=gc-friendly,resident-modules    \
+       valgrind --track-origins=yes            \
+                --leak-check=full              \
+                --leak-resolution=high         \
+                --num-callers=50               \
+                --suppressions=gtk.suppression \
+                ./gis_test                     \
        2> valgrind.out