Fix win32 compile issues

[aweather] / src / plugins / Makefile.am

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7db3716f117e75d5221d616c4fe9e4414a800427..0f10732d4d5a4a16a0f35c6fc9be71aa6d687d79 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)
+AM_CFLAGS   = -Wall --std=gnu99  -I../
+AM_CPPFLAGS = $(GIS_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version -no-undefined
+LIBS        = $(GIS_LIBS)
 
-plugindir = $(libdir)/gis
+pluginsdir  = $(pkglibdir)
 
-plugin_LTLIBRARIES = \
-       example.la \
-       radar.la   \
-       ridge.la
+plugins_LTLIBRARIES =
 
-example_la_SOURCES  = example.c example.h
-example_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
-
-ridge_la_SOURCES    = ridge.c ridge.h
-ridge_la_CPPFLAGS   = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
-
-radar_la_SOURCES = \
-       radar.c    radar.h \
+if HAVE_RSL
+plugins_LTLIBRARIES += radar.la
+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_LDFLAGS = $(AM_LDFLAGS) $(RSL_LIBS)
+endif
+
+test:
+       ( cd ../; make test )
 
 MAINTAINERCLEANFILES = Makefile.in