Win32 port

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6e33bff95030a8dfdd159d0ebc95a5113e958e7a..17c04a603b300a3fc615e724ce83e2646802d71b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,16 +43,24 @@ libgis_la_LIBADD  = $(AM_LDADD) \
        objects/libgis-objects.la \
        data/libgis-data.la
 
-# Test programs
-bin_PROGRAMS = gis-demo tile-test
+# 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
-gis_demo_LDFLAGS  = $(AM_LDFLAGS) -static
+
+# Test programs
+noinst_PROGRAMS = gis-test tile-test
+
+gis_test_SOURCES = gis-test.c
+gis_test_LDADD   = $(AM_LDADD) libgis.la
 
 tile_test_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgis.la
-tile_test_LDFLAGS = $(AM_LDFLAGS) -static
 
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -63,13 +71,13 @@ MAINTAINERCLEANFILES = Makefile.in
        glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 test: all .libs/gis
-       ./gis-demo
+       ./gis-test
 
 gdb: all .libs/gis
-       gdb ./gis-demo
+       gdb ./gis-test
 
 ddd: all .libs/gis
-       ddd ./gis-demo
+       ddd ./gis-test
 
 .libs/gis: plugins/.libs
        ln -sf ../plugins/.libs .libs/gis
@@ -82,5 +90,5 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
-                ./gis-demo                     \
+                ./gis-test                     \
        2> valgrind.out