Win32 fixes and improvements

[aweather] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 2dd2031ca40d67e3dd8f6c63dcf15d5bc799dca8..7540ecaae6a6767a1016b54f4aca5f0053e381c2 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,18 +1,23 @@
-AM_CFLAGS   = -Wall --std=gnu99  -I../
-AM_CPPFLAGS = $(GIS_CFLAGS)
-AM_LDFLAGS  = -module -avoid-version
-LIBS        = $(GIS_LIBS)
+AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
+AM_LDFLAGS  = -module -avoid-version -no-undefined
 
-pluginsdir = $(PLUGINSDIR)
+pluginsdir  = $(pkglibdir)
 
 plugins_LTLIBRARIES =
 
 if HAVE_RSL
 plugins_LTLIBRARIES += radar.la
-radar_la_SOURCES = radar.c   radar.h \
-       marching.c marching.h \
-       radar-colormap.c
-radar_la_LDFLAGS = $(AM_LDFLAGS) $(RSL_LIBS)
+radar_la_SOURCES = \
+       radar.c  radar.h \
+       level2.c level2.h \
+       ../aweather-colormap.c \
+       ../aweather-location.c
+radar_la_LIBADD  = $(RSL_LIBS) $(GIS_LIBS) \
+                  $(addprefix $(top_srcdir)/lib/,$(gl_LTLIBOBJS))
 endif
 
+test:
+       ( cd ../; make test )
+
 MAINTAINERCLEANFILES = Makefile.in