X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=d55f8146c9f3d567aeb20664288d39cb822677cf;hb=2de97420786e10cbf927d2afac204e9fa8640dec;hp=97ec6ba438d4c633dd5fbd05b57910cb08f2b9ab;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719;p=grits

diff --git a/src/Makefile.am b/src/Makefile.am
index 97ec6ba..d55f814 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = plugins
+SUBDIRS = . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 
+AM_CFLAGS   = -Wall --std=gnu99
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 
@@ -10,42 +10,50 @@ lib_LTLIBRARIES  = libgis.la
 gis_includedir = $(includedir)/gis
 gis_include_HEADERS = \
 	gis.h         \
-	gis-world.h   \
-	gis-view.h    \
+	gis-viewer.h  \
 	gis-prefs.h   \
 	gis-opengl.h  \
 	gis-plugin.h  \
+	gis-object.h  \
+	gis-util.h    \
+	gis-tile.h    \
+	gis-wms.h     \
 	gis-data.h    \
 	gpqueue.h     \
-	roam.h        \
-	wms.h
+	roam.h
 libgis_la_SOURCES = \
-	gis-world.c   gis-world.h   \
-	gis-view.c    gis-view.h    \
+	gis-viewer.c  gis-viewer.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-util.c    gis-util.h    \
+	gis-tile.c    gis-tile.h    \
+	gis-wms.c     gis-wms.h     \
 	gis-data.c    gis-data.h    \
+	gis-object.c  gis-object.h  \
 	roam.c        roam.h        \
-	wms.c         wms.h         \
 	gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
 libgis_la_LIBADD = $(AM_LDADD)
+libgis_la_LDFLAGS = -no-undefined
 
 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_LDFLAGS  = -static
-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-world.c gis-world.h wms.c wms.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
 
@@ -54,23 +62,25 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
-test: all
-	./gis_test
+test: all .libs/gis
+	./gis-demo
 
-gdb: all
-	gdb ./gis_test
+gdb: all .libs/gis
+	gdb ./gis-demo
 
-ddd: all
-	ddd ./gis_test
+ddd: all .libs/gis
+	ddd ./gis-demo
+
+.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-demo                     \
 	2> valgrind.out