Reorganize BMNG and SRTM into plugins

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bb6a37c7409867e56f8ff887200b80b0e6c2b708..97ec6ba438d4c633dd5fbd05b57910cb08f2b9ab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = plugins
+
 AM_CFLAGS   = -Wall --std=gnu99 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
@@ -29,7 +31,7 @@ libgis_la_SOURCES = \
        wms.c         wms.h         \
        gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       -DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\""
+       -DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
 libgis_la_LIBADD = $(AM_LDADD)
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -39,7 +41,8 @@ pkgconfig_DATA = libgis.pc
 bin_PROGRAMS = gis_test wms_test
 
 gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) .libs/libgis.a
+gis_test_LDFLAGS  = -static
+gis_test_LDADD    = $(AM_LDADD) libgis.la
 
 wms_test_SOURCES  = wms_test.c gis-world.c gis-world.h wms.c wms.h
 wms_test_LDADD    = $(AM_LDADD)
@@ -55,10 +58,10 @@ test: all
        ./gis_test
 
 gdb: all
-       LD_LIBRARY_PATH=.libs gdb .libs/gis_test
+       gdb ./gis_test
 
 ddd: all
-       LD_LIBRARY_PATH=.libs ddd .libs/gis_test
+       ddd ./gis_test
 
 memcheck: all
        LD_LIBRARY_PATH=.libs                      \