X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=195c19920b9b68d58ad62fa5880d694ce521cb66;hb=b088e18d9e838064bb264a145ff66e57886ee42a;hp=5e3da6d153b43e6a36447e40cfb36366495f0c20;hpb=2e575e2c348f44d3c723ac344b7296492c76f77a;p=grits

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e3da6d..195c199 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,31 +10,33 @@ 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-util.h    \
 	gis-data.h    \
 	gis-tile.h    \
 	gis-wms.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-util.c    gis-util.h    \
 	gis-data.c    gis-data.h    \
 	gis-tile.c    gis-tile.h    \
 	gis-wms.c     gis-wms.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
@@ -43,10 +45,10 @@ pkgconfig_DATA = libgis.pc
 bin_PROGRAMS = gis_test wms_test
 
 gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDFLAGS  = -static
 gis_test_LDADD    = $(AM_LDADD) libgis.la
+gis_test_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_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)
 
 MAINTAINERCLEANFILES = Makefile.in