X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2FMakefile.am;h=17c04a603b300a3fc615e724ce83e2646802d71b;hp=70ebf3c8c05e5630e291d4fd4e238e5b6b8181bc;hb=e7127ea74717754c48779467aca2f9a1596a99f0;hpb=becee285e152746e64b6d3984e2a7229f664062d

diff --git a/src/Makefile.am b/src/Makefile.am
index 70ebf3c..17c04a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,53 +1,67 @@
-SUBDIRS = . plugins
+SUBDIRS = data objects . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 
+AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
+AM_LDFLAGS  = --as-needed -no-undefined
 
-# Library
 BUILT_SOURCES = gis-marshal.c gis-marshal.h
-lib_LTLIBRARIES  = libgis.la
+
+
+# Headers
 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-tile.h    \
-	gis-wms.h     \
+	gis-util.h    \
 	gpqueue.h     \
 	roam.h
-libgis_la_SOURCES = \
-	gis-world.c   gis-world.h   \
-	gis-view.c    gis-view.h    \
+
+# Pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.pc
+
+# Library
+lib_LTLIBRARIES = libgis.la
+
+libgis_la_SOURCES = gis.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-tile.c    gis-tile.h    \
-	gis-wms.c     gis-wms.h     \
+	gis-util.c    gis-util.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)
+	-DPKGDATADIR="\"$(datadir)/gis\"" \
+	-DPLUGINSDIR="\"$(libdir)/gis\""
+libgis_la_LIBADD  = $(AM_LDADD) \
+	objects/libgis-objects.la \
+	data/libgis-data.la
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+# Demo program
+if NOTWIN32
+AM_LDFLAGS += -static
+endif
+
+bin_PROGRAMS = gis-demo
+
+gis_demo_SOURCES  = gis-demo.c
+gis_demo_LDADD    = $(AM_LDADD) libgis.la
 
 # Test programs
-bin_PROGRAMS = gis_test wms_test
+noinst_PROGRAMS = gis-test tile-test
+
+gis_test_SOURCES = gis-test.c
+gis_test_LDADD   = $(AM_LDADD) libgis.la
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDFLAGS  = -static
-gis_test_LDADD    = $(AM_LDADD) libgis.la
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgis.la
 
-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
 
@@ -57,13 +71,13 @@ MAINTAINERCLEANFILES = Makefile.in
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 test: all .libs/gis
-	./gis_test
+	./gis-test
 
 gdb: all .libs/gis
-	gdb ./gis_test
+	gdb ./gis-test
 
 ddd: all .libs/gis
-	ddd ./gis_test
+	ddd ./gis-test
 
 .libs/gis: plugins/.libs
 	ln -sf ../plugins/.libs .libs/gis
@@ -76,5 +90,5 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis_test                     \
+	         ./gis-test                     \
 	2> valgrind.out