None code changes: TODO, Makefile, vimrc

[grits] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7db3716f117e75d5221d616c4fe9e4414a800427..6e49cb82c60e95a19106a0d5aff0629e824143bd 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,25 +1,21 @@
-AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99  -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-AM_LDFLAGS  = -module $(GLIB_LIBS) $(GTK_LIBS)
-
-plugindir = $(libdir)/gis
+MAINTAINERCLEANFILES = Makefile.in
 
-plugin_LTLIBRARIES = \
-       example.la \
-       radar.la   \
-       ridge.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
 
-example_la_SOURCES  = example.c example.h
-example_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+pluginsdir  = $(pkglibdir)
 
-ridge_la_SOURCES    = ridge.c ridge.h
-ridge_la_CPPFLAGS   = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+plugins_LTLIBRARIES = bmng.la srtm.la
+bmng_la_SOURCES     = bmng.c bmng.h
+srtm_la_SOURCES     = srtm.c srtm.h
 
-radar_la_SOURCES = \
-       radar.c    radar.h \
-       marching.c marching.h \
-       radar-colormap.c
-radar_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS) $(RSL_CFLAGS)
-radar_la_LIBADD = $(SOUP_LIBS) $(RSL_LIBS)
+test:
+       ( cd ../; make test )
 
-MAINTAINERCLEANFILES = Makefile.in
+# Fixme...
+bmng_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
+srtm_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
+$(top_srcdir)/src/libgis.la: $(wildcard ../*.[ch])
+       ( cd ../; make libgis.la )