packaging fixes

diff --git a/configure.ac b/configure.ac
index 4e8929ee4ffcc9fbe7fbf1246e01bac18b1fc7e0..583b00df5c4b8c7b4f72c41a4c0334565c03405b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.2.0], [spenceal@rose-hulman.edu])
+AC_INIT([aweather], [0.2.1], [spenceal@rose-hulman.edu])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index d831149ebe2df37f39703aef9fa93ba5e18b5bcd..7db3716f117e75d5221d616c4fe9e4414a800427 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -9,19 +9,15 @@ plugin_LTLIBRARIES = \
        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_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 \
+       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)

diff --git a/src/plugins/radar-misc.h b/src/plugins/radar-misc.h
deleted file mode 100644 (file)
index 7e260e8..0000000
--- a/src/plugins/radar-misc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#define RSL_FOREACH_VOL(radar, volume, count, index) \
-       guint count = 0; \
-       for (guint index = 0; index < radar->h.nvolumes; index++) { \
-               Volume *volume = radar->v[index]; \
-               if (volume == NULL) continue; \
-               count++;
-
-#define RSL_FOREACH_SWEEP(volume, sweep, count, index) \
-       guint count = 0; \
-       for (guint index = 0; index < volume->h.nsweeps; index++) { \
-               Sweep *sweep = volume->sweep[index]; \
-               if (sweep == NULL || sweep->h.elev == 0) continue; \
-               count++;
-
-#define RSL_FOREACH_RAY(sweep, ray, count, index) \
-       guint count = 0; \
-       for (guint index = 0; index < sweep->h.nrays; index++) { \
-               Ray *ray = sweep->ray[index]; \
-               if (ray == NULL) continue; \
-               count++;
-
-#define RSL_FOREACH_BIN(ray, bin, count, index) \
-       guint count = 0; \
-       for (guint index = 0; index < ray->h.nbins; index++) { \
-               Range bin = ray->range[index]; \
-               count++;
-
-#define RSL_FOREACH_END }

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index c91215100c70ab15f2ec40217e3caa5ebc3c6896..26403eaecce57bfd76bddc0426e3e34ebbeba5fc 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -25,9 +25,8 @@
 
 #include <gis/gis.h>
 
-#include "marching.h"
 #include "radar.h"
-#include "radar-misc.h"
+#include "marching.h"
 
 /****************
  * GObject code *

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index c4b74beab4c85b469a68638788b07f118fa4ad13..34a260752ab7e7b5c2d9bceef1e6a736bd6b8172 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -75,4 +75,34 @@ GType gis_plugin_radar_get_type();
 /* Methods */
 GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
 
+/* Misc. RSL helpers */
+#define RSL_FOREACH_VOL(radar, volume, count, index) \
+       guint count = 0; \
+       for (guint index = 0; index < radar->h.nvolumes; index++) { \
+               Volume *volume = radar->v[index]; \
+               if (volume == NULL) continue; \
+               count++;
+
+#define RSL_FOREACH_SWEEP(volume, sweep, count, index) \
+       guint count = 0; \
+       for (guint index = 0; index < volume->h.nsweeps; index++) { \
+               Sweep *sweep = volume->sweep[index]; \
+               if (sweep == NULL || sweep->h.elev == 0) continue; \
+               count++;
+
+#define RSL_FOREACH_RAY(sweep, ray, count, index) \
+       guint count = 0; \
+       for (guint index = 0; index < sweep->h.nrays; index++) { \
+               Ray *ray = sweep->ray[index]; \
+               if (ray == NULL) continue; \
+               count++;
+
+#define RSL_FOREACH_BIN(ray, bin, count, index) \
+       guint count = 0; \
+       for (guint index = 0; index < ray->h.nbins; index++) { \
+               Range bin = ray->range[index]; \
+               count++;
+
+#define RSL_FOREACH_END }
+
 #endif