Moving -Werror to gen.sh, improving wms_test

[grits] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7a0c4be29e1c1993f72ca9d9cf2afc096ccb36db..c7c60b2527ccee9f48be863f5ed1cf9204ce548b 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,29 +1,22 @@
-AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99  -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-AM_LDFLAGS  = -module $(GLIB_LIBS) $(GTK_LIBS)
+AM_CFLAGS   = -Wall --std=gnu99  -I../
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version
 
-plugindir = $(libdir)/aweather
+plugindir = $(libdir)/gis
 
 plugin_LTLIBRARIES = \
        example.la \
        radar.la   \
        ridge.la
 
-example_la_SOURCES = \
-       example.c \
-       example.h
-example_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+example_la_SOURCES = example.c example.h
 
-ridge_la_SOURCES = \
-       ridge.c \
-       ridge.h
-ridge_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+ridge_la_SOURCES   = ridge.c   ridge.h
 
-radar_la_SOURCES = \
-       radar.c \
-       radar.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)
+radar_la_CPPFLAGS = $(RSL_CFLAGS) $(AM_CPPFLAGS) 
+radar_la_LIBADD   = $(RSL_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in