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)
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-data.h \
+ gis-object.h \
+ gis-util.h \
gis-tile.h \
gis-wms.h \
+ gis-data.h \
gpqueue.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-data.c gis-data.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 \
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 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
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
--leak-resolution=high \
--num-callers=50 \
--suppressions=gtk.suppression \
- ./gis_test \
+ ./gis-demo \
2> valgrind.out