Fix misc bugs and bump version to 0.3

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index fcf59766b21684b8b0b599dcf57f16a32009d3aa..70ebf3c8c05e5630e291d4fd4e238e5b6b8181bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = plugins
+SUBDIRS = . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
@@ -16,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    \
@@ -27,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\""
@@ -44,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