packaging fixes

[grits] / src / plugins / Makefile.am

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