X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2FMakefile.am;h=210cfe05816b1c0d070a1801bb5b05558aa18b79;hp=26b68566abe1bb4e18f53958c341b5c7e593b5a5;hb=c2e55f28ba50e19fbf792a27009778e9dcca6fbb;hpb=1edd074095d135767d28f4d30de41bdd0af1a1fb

diff --git a/src/Makefile.am b/src/Makefile.am
index 26b6856..210cfe0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = objects . plugins
+SUBDIRS = data objects . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 -Iobjects
+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
@@ -17,8 +17,6 @@ gis_include_HEADERS = \
 	gis-opengl.h  \
 	gis-plugin.h  \
 	gis-util.h    \
-	gis-wms.h     \
-	gis-data.h    \
 	gpqueue.h     \
 	roam.h
 
@@ -36,26 +34,41 @@ libgis_la_SOURCES = gis.h \
 	gis-plugin.c  gis-plugin.h  \
 	gis-marshal.c gis-marshal.h \
 	gis-util.c    gis-util.h    \
-	gis-wms.c     gis-wms.h     \
-	gis-data.c    gis-data.h    \
 	roam.c        roam.h        \
 	gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPKGDATADIR="\"$(datadir)/gis\"" \
-	-DPLUGINSDIR="\"$(libdir)/gis\""
+	-DPKGDATADIR="\"$(dots)$(datadir)/$(GIS_SUBDIR)\"" \
+	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GIS_SUBDIR)\""
 libgis_la_LIBADD  = $(AM_LDADD) \
-	objects/libgis-objects.la
+	objects/libgis-objects.la \
+	data/libgis-data.la
+libgis_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info $(LIB_VERSION)
 
-# Test programs
-bin_PROGRAMS = gis-demo tile-test
+# Demo program
+if WIN32
+AM_LDFLAGS += -mwindows
+dots        = ..
+else
+BINLDFLAGS  = -static
+endif
+
+bin_PROGRAMS = gis-demo
 
 gis_demo_SOURCES  = gis-demo.c
 gis_demo_LDADD    = $(AM_LDADD) libgis.la
-gis_demo_LDFLAGS  = $(AM_LDFLAGS) -static
+gis_demo_LDFLAGS  = $(BINLDFLAGS)
+
+# Test programs
+noinst_PROGRAMS = gis-test tile-test
+
+gis_test_SOURCES = gis-test.c
+gis_test_LDADD   = $(AM_LDADD) libgis.la
+gis_test_LDFLAGS  = $(BINLDFLAGS)
 
 tile_test_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgis.la
-tile_test_LDFLAGS = $(AM_LDFLAGS) -static
+tile_test_LDFLAGS = $(BINLDFLAGS)
 
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -65,17 +78,17 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
-test: all .libs/gis
-	./gis-demo
+test: all .libs/$(GIS_SUBDIR)
+	./gis-test
 
-gdb: all .libs/gis
-	gdb ./gis-demo
+gdb: all .libs/$(GIS_SUBDIR)
+	gdb ./gis-test
 
-ddd: all .libs/gis
-	ddd ./gis-demo
+ddd: all .libs/$(GIS_SUBDIR)
+	ddd ./gis-test
 
-.libs/gis: plugins/.libs
-	ln -sf ../plugins/.libs .libs/gis
+.libs/$(GIS_SUBDIR): plugins/.libs
+	ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR)
 
 memcheck: all
 	G_SLICE=always-malloc                   \
@@ -85,5 +98,5 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis-demo                     \
+	         ./gis-test                     \
 	2> valgrind.out