From 7200f71a7275a4ca3faa4d3d8182720fcc0b9496 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Fri, 7 Aug 2009 00:09:11 +0000
Subject: [PATCH] packaging fixes

---
 configure.ac             |  2 +-
 src/plugins/Makefile.am  | 14 +++++---------
 src/plugins/radar-misc.h | 28 ----------------------------
 src/plugins/radar.c      |  3 +--
 src/plugins/radar.h      | 30 ++++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 src/plugins/radar-misc.h

diff --git a/configure.ac b/configure.ac
index 4e8929e..583b00d 100644
--- 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 d831149..7db3716 100644
--- 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
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 c912151..26403ea 100644
--- 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 c4b74be..34a2607 100644
--- 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
-- 
2.43.2