Automake and GCC fixes

[grits] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7db3716f117e75d5221d616c4fe9e4414a800427..ca4b078ff62916bb60111d8fc39d01587ca978cf 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99  -I../
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-AM_LDFLAGS  = -module $(GLIB_LIBS) $(GTK_LIBS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version
 
 plugindir = $(libdir)/gis
 
@@ -9,17 +9,14 @@ plugin_LTLIBRARIES = \
        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