X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis%2FMakefile.am;h=67a90ddc24ba9ab17527092a6200dc1dad9ad774;hp=786be0073513d76f8f008d5ce51d324cb0ad7c99;hb=d01fb11de5bcf91224348bf41abb6788d0af2545;hpb=e1ff13276e99a6707586fe43904d5d432cdcb1fe

diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 786be00..67a90dd 100644
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -1,5 +1,6 @@
 AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
 
+# Library
 BUILT_SOURCES = gis-marshal.c gis-marshal.h
 lib_LTLIBRARIES  = libgis.la
 gis_includedir = $(includedir)/gis
@@ -12,15 +13,35 @@ gis_include_HEADERS = \
 	gis-plugin.h  \
 	gis-data.h
 libgis_la_SOURCES = \
-	gis-world.c   gis-world.h  \
-	gis-view.c    gis-view.h   \
-	gis-prefs.c   gis-prefs.h  \
-	gis-opengl.c  gis-opengl.h \
-	gis-plugin.c  gis-plugin.h \
-	gis-data.c    gis-data.h   \
-	gis-marshal.c gis-marshal.h
-libgis_la_CPPFLAGS = -DPLUGINDIR="\"$(libdir)/gis\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-libgis_la_LIBADD = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+	gis-world.c   gis-world.h   \
+	gis-view.c    gis-view.h    \
+	gis-prefs.c   gis-prefs.h   \
+	gis-opengl.c  gis-opengl.h  \
+	gis-plugin.c  gis-plugin.h  \
+	gis-marshal.c gis-marshal.h \
+	gis-data.c    gis-data.h    \
+	roam.c        roam.h        \
+	wms.c         wms.h         \
+	gpqueue.c     gpqueue.h
+libgis_la_CPPFLAGS = \
+	-DDATADIR="\"$(datadir)\"" -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
+
+# Test programs
+bin_PROGRAMS = gis_test wms_test
+
+gis_test_SOURCES  = gis_test.c gis.h
+gis_test_CPPFLAGS = $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+gis_test_LDADD    = libgis.la $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+
+wms_test_SOURCES  = wms_test.c gis-world.c gis-world.h wms.c wms.h
+wms_test_CPPFLAGS = $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+wms_test_LDADD    = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -28,3 +49,25 @@ MAINTAINERCLEANFILES = Makefile.in
 	glib-genmarshal --prefix=gis_cclosure_marshal --body   $< > $@
 .list.h:
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
+
+test: all
+	make -C ../plugins all
+	LD_LIBRARY_PATH=.libs .libs/gis_test
+
+gdb: all
+	LD_LIBRARY_PATH=.libs gdb .libs/gis_test
+
+ddd: all
+	LD_LIBRARY_PATH=.libs ddd .libs/gis_test
+
+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                    \
+	2> valgrind.out