Win32 port

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 81258ff512a835cbbc71359bb2f5f735537df0d7..17c04a603b300a3fc615e724ce83e2646802d71b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,14 @@
-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         \
@@ -15,41 +17,51 @@ gis_include_HEADERS = \
        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 = \
+
+# 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-util.c    gis-util.h    \
-       gis-data.c    gis-data.h    \
-       gis-tile.c    gis-tile.h    \
-       gis-wms.c     gis-wms.h     \
-       gis-prims.c   gis-prims.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
+       -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_LDADD    = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = -static
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgis.la
 
-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
 
@@ -59,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
@@ -78,5 +90,5 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
-                ./gis_test                     \
+                ./gis-test                     \
        2> valgrind.out