Fix misc bugs and bump version to 0.3

[grits] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 4f597794b8b8ccd0038c4a7c78c94d979f51609c..3ebba58d03ffb65696d1d619b96eae60b308d1b1 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,18 +1,17 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CFLAGS       = -Wall --std=gnu99  -I../
-AM_CPPFLAGS     = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDFLAGS      = -module -avoid-version
-LIBS            = $(top_srcdir)/src/libgis.la
+AM_CFLAGS   = -Wall --std=gnu99  -I../
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version
+LIBS        = $(top_srcdir)/src/libgis.la
 
-pluginsdir  = $(pkglibdir)
+pluginsdir  = "$(libdir)/gis"
 
-plugins_LTLIBRARIES  = bmng.la srtm.la
-bmng_la_SOURCES      = bmng.c bmng.h
-srtm_la_SOURCES      = srtm.c srtm.h
+plugins_LTLIBRARIES = bmng.la srtm.la
+bmng_la_SOURCES     = bmng.c bmng.h
+bmng_la_LIBADD      = $(top_srcdir)/src/libgis.la
+srtm_la_SOURCES     = srtm.c srtm.h
+srtm_la_LIBADD      = $(top_srcdir)/src/libgis.la
 
-# Fixme...
-bmng_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
-srtm_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
-$(top_srcdir)/src/libgis.la:
-       ( cd ../; make libgis.la )
+test:
+       ( cd ../; make test )