Win32 port

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 26b68566abe1bb4e18f53958c341b5c7e593b5a5..17c04a603b300a3fc615e724ce83e2646802d71b 100644 (file)
--- 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,33 @@ 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\""
 libgis_la_LIBADD  = $(AM_LDADD) \
-       objects/libgis-objects.la
+       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
@@ -66,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
@@ -85,5 +90,5 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
-                ./gis-demo                     \
+                ./gis-test                     \
        2> valgrind.out