X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=d55f8146c9f3d567aeb20664288d39cb822677cf;hb=72ae2b9bd30e518fa1539424ad0d994aa8d8a6de;hp=b10656547e2e2bb5707d0bcc19a740742191191c;hpb=a2a902d978b6050289f7a92794fb1dc0aa2b5e26;p=grits

diff --git a/src/Makefile.am b/src/Makefile.am
index b106565..d55f814 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,10 +14,11 @@ gis_include_HEADERS = \
 	gis-prefs.h   \
 	gis-opengl.h  \
 	gis-plugin.h  \
+	gis-object.h  \
 	gis-util.h    \
-	gis-data.h    \
 	gis-tile.h    \
 	gis-wms.h     \
+	gis-data.h    \
 	gpqueue.h     \
 	roam.h
 libgis_la_SOURCES = \
@@ -27,10 +28,10 @@ libgis_la_SOURCES = \
 	gis-plugin.c  gis-plugin.h  \
 	gis-marshal.c gis-marshal.h \
 	gis-util.c    gis-util.h    \
-	gis-data.c    gis-data.h    \
 	gis-tile.c    gis-tile.h    \
 	gis-wms.c     gis-wms.h     \
-	gis-prims.c   gis-prims.h   \
+	gis-data.c    gis-data.h    \
+	gis-object.c  gis-object.h  \
 	roam.c        roam.h        \
 	gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -42,13 +43,17 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
 
 # Test programs
-bin_PROGRAMS = gis_test wms_test
+bin_PROGRAMS = gis-demo tile-test
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_SOURCES  = gis-demo.c gis.h
+gis_demo_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_LDFLAGS  = -static
 
-wms_test_SOURCES  = wms_test.c gis-util.c gis-util.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
-wms_test_LDADD    = $(AM_LDADD)
+tile_test_SOURCES = tile-test.c   \
+	gis-util.c   gis-util.h   \
+	gis-tile.c   gis-tile.h   \
+	gis-wms.c    gis-wms.h
+tile_test_LDADD   = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -58,13 +63,13 @@ MAINTAINERCLEANFILES = Makefile.in
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 test: all .libs/gis
-	./gis_test
+	./gis-demo
 
 gdb: all .libs/gis
-	gdb ./gis_test
+	gdb ./gis-demo
 
 ddd: all .libs/gis
-	ddd ./gis_test
+	ddd ./gis-demo
 
 .libs/gis: plugins/.libs
 	ln -sf ../plugins/.libs .libs/gis
@@ -77,5 +82,5 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis_test                     \
+	         ./gis-demo                     \
 	2> valgrind.out