Add version info for Debian

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6e33bff95030a8dfdd159d0ebc95a5113e958e7a..210cfe05816b1c0d070a1801bb5b05558aa18b79 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,22 +37,38 @@ libgis_la_SOURCES = gis.h \
        roam.c        roam.h        \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
        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 \
        data/libgis-data.la
 libgis_la_LIBADD  = $(AM_LDADD) \
        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_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_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgis.la

-tile_test_LDFLAGS = $(AM_LDFLAGS) -static
+tile_test_LDFLAGS = $(BINLDFLAGS)

 
 
 MAINTAINERCLEANFILES = Makefile.in
 
 
 MAINTAINERCLEANFILES = Makefile.in


@@ -62,17 +78,17 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
        glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 .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                   \
 
 memcheck: all
        G_SLICE=always-malloc                   \


@@ -82,5 +98,5 @@ memcheck: all
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
                 --leak-resolution=high         \
                 --num-callers=50               \
                 --suppressions=gtk.suppression \

-                ./gis-demo                     \
+                ./gis-test                     \

        2> valgrind.out
        2> valgrind.out