Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 277478 | Differences between
and this patch

Collapse All | Expand All

(-)rsl-v1.40/colors/Makefile.am (-1 / +1 lines)
Lines 1-6 Link Here
1
AUTOMAKE_OPTIONS = foreign
1
AUTOMAKE_OPTIONS = foreign
2
2
3
colordir = $(prefix)/lib/colors
3
colordir = $(datadir)/rsl/colors
4
color_DATA = *.???
4
color_DATA = *.???
5
5
6
EXTRA_DIST = $(color_DATA)
6
EXTRA_DIST = $(color_DATA)
(-)rsl-v1.40/colors/Makefile.in (-1 / +1 lines)
Lines 166-172 Link Here
166
sysconfdir = @sysconfdir@
166
sysconfdir = @sysconfdir@
167
target_alias = @target_alias@
167
target_alias = @target_alias@
168
AUTOMAKE_OPTIONS = foreign
168
AUTOMAKE_OPTIONS = foreign
169
colordir = $(prefix)/lib/colors
169
colordir = $(datadir)/rsl/colors
170
color_DATA = *.???
170
color_DATA = *.???
171
EXTRA_DIST = $(color_DATA)
171
EXTRA_DIST = $(color_DATA)
172
all: all-am
172
all: all-am
(-)rsl-v1.40/Makefile.am (-48 / +24 lines)
Lines 1-73 Link Here
1
## Process w/ automake.  Or, autoreconf; make ##
1
## Process w/ automake.  Or, autoreconf; make ##
2
AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\""
2
AUTOMAKE_OPTIONS = foreign
3
AUTOMAKE_OPTIONS = foreign
3
SUBDIRS = . colors doc examples
4
SUBDIRS = . colors doc examples
4
INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include
5
INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include
5
6
6
includedir = $(prefix)/include 
7
colordir = $(libdir)/colors
8
9
lib_LTLIBRARIES = librsl.la
7
lib_LTLIBRARIES = librsl.la
10
8
11
librsl_la_LDFLAGS = -version-info 1:40
9
wsr88ddir = $(datadir)/rsl/
12
librsl_la_SOURCES = \
10
dist_wsr88d_DATA = wsr88d_locations.dat
13
$(rapic_c) $(radtec_c)\
14
dorade.c dorade_print.c dorade_to_radar.c\
15
lassen.c lassen_to_radar.c \
16
edge_to_radar.c \
17
 radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
18
 range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
19
 carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
20
 ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \
21
 mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \
22
 gzip.c prune.c reverse.c fix_headers.c \
23
 nsig_to_radar.c nsig.c nsig2_to_radar.c \
24
 africa_to_radar.c africa.c \
25
 radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
26
 radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
27
28
librsl_la_DEPENDENCIES = $(build_headers)
29
11
30
build_headers = rsl.h wsr88d.h toolkit_1BC-51_appl.h
12
include_HEADERS = rsl.h toolkit_1BC-51_appl.h
31
13
32
headers = africa.h dorade.h lassen.h \
14
headers = africa.h dorade.h lassen.h \
33
          mcgill.h nsig.h radtec.h rainbow.h \
15
          mcgill.h nsig.h radtec.h rainbow.h \
34
          rapic_routines.h toga.h \
16
          rapic_routines.h toga.h \
35
		  $(build_headers)
17
          wsr88d.h \
18
	  $(include_HEADERS)
19
20
librsl_la_LDFLAGS = -version-info 1:40
21
librsl_la_SOURCES = \
22
    $(rapic_c) $(radtec_c) \
23
    dorade.c dorade_print.c dorade_to_radar.c \
24
    lassen.c lassen_to_radar.c \
25
    edge_to_radar.c \
26
    radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
27
    range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
28
    carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
29
    ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \
30
    mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \
31
    gzip.c prune.c reverse.c fix_headers.c \
32
    nsig_to_radar.c nsig.c nsig2_to_radar.c \
33
    africa_to_radar.c africa.c \
34
    radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
35
    radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
36
36
37
37
rapic_c =  rapic_to_radar.c rapic.y rapic-lex.l rapic_routines.c
38
rapic_c =  rapic_to_radar.c rapic.y rapic-lex.l rapic_routines.c
38
radtec_c = radtec_to_radar.c radtec.c
39
radtec_c = radtec_to_radar.c radtec.c
39
40
40
41
41
rsl.h: Makefile
42
	@for h in $(build_headers); do \
43
	echo -n "Checking substitutions in header file $$h ... "; \
44
	cp $$h $$h.in; \
45
	sed -e 's/RSL_VERSION_STR.*/RSL_VERSION_STR \"$(VERSION)\"/' \
46
         -e 's|#define COLORDIR.*|#define COLORDIR \"$(colordir)\"|' \
47
         -e 's|#define WSR88D_SITE_INFO_FILE.*|#define WSR88D_SITE_INFO_FILE \"$(libdir)/wsr88d_locations.dat\"|' \
48
    < $$h.in > $$h.new; \
49
	if cmp -s $$h $$h.new; then \
50
       rm $$h.new; \
51
       echo "$$h remains untouched."; \
52
    else \
53
       mv $$h.new $$h; \
54
       echo "substitutions made in $$h."; \
55
    fi; \
56
	rm -f $$h.in; \
57
    done
58
59
PREFIX = rapic
42
PREFIX = rapic
60
LFLAGS = -P$(PREFIX)
43
LFLAGS = -P$(PREFIX)
61
YFLAGS = -d -p $(PREFIX)
44
YFLAGS = -d -p $(PREFIX)
62
LEX_OUTPUT_ROOT = lex.$(PREFIX)
45
LEX_OUTPUT_ROOT = lex.$(PREFIX)
63
46
64
65
install-exec-hook:
66
	$(INSTALL) -d  $(includedir)
67
	$(INSTALL) -m 644 rsl.h $(includedir)
68
	$(INSTALL) -m 644 toolkit_1BC-51_appl.h $(includedir)
69
	$(INSTALL) -m 644 wsr88d_locations.dat $(libdir)
70
71
EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h
47
EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h
72
48
73
DISTCLEANFILES = rapic.c rapic-lex.c
49
DISTCLEANFILES = rapic.c rapic-lex.c
(-)rsl-v1.40/radar.c (-1 / +1 lines)
Lines 60-66 Link Here
60
60
61
void RSL_print_version()
61
void RSL_print_version()
62
{
62
{
63
  printf("RSL version %s.\n", RSL_VERSION_STR);
63
  printf("RSL version %s.\n", VERSION);
64
}
64
}
65
65
66
/* Debug printing global variable: radar_verbose_flag */
66
/* Debug printing global variable: radar_verbose_flag */
(-)rsl-v1.40/radar_to_uf.c (-1 / +1 lines)
Lines 316-322 Link Here
316
		uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
316
		uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
317
		uf_ma[38] = tm->tm_mon+1;
317
		uf_ma[38] = tm->tm_mon+1;
318
		uf_ma[39] = tm->tm_mday;
318
		uf_ma[39] = tm->tm_mday;
319
		memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
319
		memcpy(&uf_ma[40], "RSL" VERSION, 8);
320
		if (little_endian()) swap2(&uf_ma[40], 8/2);
320
		if (little_endian()) swap2(&uf_ma[40], 8/2);
321
		uf_ma[44] = (signed short)UF_NO_DATA;
321
		uf_ma[44] = (signed short)UF_NO_DATA;
322
		len_ma = 45;
322
		len_ma = 45;
(-)rsl-v1.40/read_write.c (-1 / +1 lines)
Lines 314-320 Link Here
314
  if (radar == NULL) return 0;
314
  if (radar == NULL) return 0;
315
  
315
  
316
  memset(title, 0, sizeof(title));
316
  memset(title, 0, sizeof(title));
317
  (void)sprintf(title, "RSL v%s. sizeof(Range) %d", RSL_VERSION_STR, sizeof(Range));
317
  (void)sprintf(title, "RSL v%s. sizeof(Range) %d", VERSION, sizeof(Range));
318
  n += fwrite(title, sizeof(char), sizeof(title), fp);
318
  n += fwrite(title, sizeof(char), sizeof(title), fp);
319
  
319
  
320
  memset(header_buf, 0, sizeof(header_buf));
320
  memset(header_buf, 0, sizeof(header_buf));
(-)rsl-v1.40/rsl.h (-15 / +13 lines)
Lines 27-34 Link Here
27
#include "config.h"
27
#include "config.h"
28
#endif
28
#endif
29
29
30
#define RSL_VERSION_STR "v1.40"
31
32
/**********************************************************************/
30
/**********************************************************************/
33
/* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
31
/* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
34
/*            values with two bytes.  Otherwise, use one byte.        */
32
/*            values with two bytes.  Otherwise, use one byte.        */
Lines 46-52 Link Here
46
/*            so you shouldn't have to modify anything here.          */
44
/*            so you shouldn't have to modify anything here.          */
47
/**********************************************************************/
45
/**********************************************************************/
48
#ifndef COLORDIR
46
#ifndef COLORDIR
49
#define COLORDIR "/usr/local/trmm/GVBOX/lib/colors"
47
#define COLORDIR DATADIR "/colors"
50
#endif
48
#endif
51
49
52
/* These are the color table indexes. See RSL_set/get_color_table. */
50
/* These are the color table indexes. See RSL_set/get_color_table. */
Lines 57-74 Link Here
57
/* The default color tables for reflectivity, velocity, spectral width,
55
/* The default color tables for reflectivity, velocity, spectral width,
58
 * height, rainfall, and zdr.
56
 * height, rainfall, and zdr.
59
 */
57
 */
60
#define REFL_RED_FILE   COLORDIR "/red_reflectivity.clr"
58
#define REFL_RED_FILE       COLORDIR "/red_reflectivity.clr"
61
#define REFL_GREEN_FILE COLORDIR "/grn_reflectivity.clr"
59
#define REFL_GREEN_FILE     COLORDIR "/grn_reflectivity.clr"
62
#define REFL_BLUE_FILE  COLORDIR "/blu_reflectivity.clr"
60
#define REFL_BLUE_FILE      COLORDIR "/blu_reflectivity.clr"
63
#define VEL_RED_FILE    COLORDIR "/red_velocity.clr"
61
#define VEL_RED_FILE        COLORDIR "/red_velocity.clr"
64
#define VEL_GREEN_FILE  COLORDIR "/grn_velocity.clr"
62
#define VEL_GREEN_FILE      COLORDIR "/grn_velocity.clr"
65
#define VEL_BLUE_FILE   COLORDIR "/blu_velocity.clr"
63
#define VEL_BLUE_FILE       COLORDIR "/blu_velocity.clr"
66
#define SW_RED_FILE     COLORDIR "/red_spectral_width.clr"
64
#define SW_RED_FILE         COLORDIR "/red_spectral_width.clr"
67
#define SW_GREEN_FILE   COLORDIR "/grn_spectral_width.clr"
65
#define SW_GREEN_FILE       COLORDIR "/grn_spectral_width.clr"
68
#define SW_BLUE_FILE    COLORDIR "/blu_spectral_width.clr"
66
#define SW_BLUE_FILE        COLORDIR "/blu_spectral_width.clr"
69
#define HEIGHT_RED_FILE   COLORDIR "/red_height.clr"
67
#define HEIGHT_RED_FILE     COLORDIR "/red_height.clr"
70
#define HEIGHT_GREEN_FILE COLORDIR "/grn_height.clr"
68
#define HEIGHT_GREEN_FILE   COLORDIR "/grn_height.clr"
71
#define HEIGHT_BLUE_FILE  COLORDIR "/blu_height.clr"
69
#define HEIGHT_BLUE_FILE    COLORDIR "/blu_height.clr"
72
#define RAINFALL_RED_FILE   COLORDIR "/red_rainfall.clr"
70
#define RAINFALL_RED_FILE   COLORDIR "/red_rainfall.clr"
73
#define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
71
#define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
74
#define RAINFALL_BLUE_FILE  COLORDIR "/blu_rainfall.clr"
72
#define RAINFALL_BLUE_FILE  COLORDIR "/blu_rainfall.clr"
(-)rsl-v1.40/wsr88d.h (-1 / +1 lines)
Lines 7-13 Link Here
7
 * The directory should be the same as the LIBDIR in the makefile.
7
 * The directory should be the same as the LIBDIR in the makefile.
8
 */
8
 */
9
#ifndef WSR88D_SITE_INFO_FILE
9
#ifndef WSR88D_SITE_INFO_FILE
10
#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/GVBOX/lib/wsr88d_locations.dat"
10
#define WSR88D_SITE_INFO_FILE DATADIR "/wsr88d_locations.dat"
11
#endif
11
#endif
12
/*===============================================================*/
12
/*===============================================================*/
13
typedef struct {
13
typedef struct {

Return to bug 277478