Pileus Git - grits/blob - opt/rsl/rsl-automake.patch

   1 diff -ru rsl-v1.40/colors/Makefile.am rsl-v1.40.new/colors/Makefile.am
   2 --- rsl-v1.40/colors/Makefile.am        1999-12-10 03:28:38.000000000 +0000
   3 +++ rsl-v1.40.new/colors/Makefile.am    2008-12-27 11:26:01.000000000 +0000
   4 @@ -1,6 +1,6 @@
   5  AUTOMAKE_OPTIONS = foreign
   6
   7 -colordir = $(prefix)/lib/colors
   8 +colordir = $(datadir)/rsl/colors
   9  color_DATA = *.???
  10
  11  EXTRA_DIST = $(color_DATA)
  12 diff -ru rsl-v1.40/colors/Makefile.in rsl-v1.40.new/colors/Makefile.in
  13 --- rsl-v1.40/colors/Makefile.in        2008-12-27 11:30:45.000000000 +0000
  14 +++ rsl-v1.40.new/colors/Makefile.in    2008-12-27 11:26:07.000000000 +0000
  15 @@ -166,7 +166,7 @@
  16  sysconfdir = @sysconfdir@
  17  target_alias = @target_alias@
  18  AUTOMAKE_OPTIONS = foreign
  19 -colordir = $(prefix)/lib/colors
  20 +colordir = $(datadir)/rsl/colors
  21  color_DATA = *.???
  22  EXTRA_DIST = $(color_DATA)
  23  all: all-am
  24 diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
  25 --- rsl-v1.40/Makefile.am       2008-10-10 20:06:57.000000000 +0000
  26 +++ rsl-v1.40.new/Makefile.am   2008-12-27 11:25:59.000000000 +0000
  27 @@ -1,73 +1,49 @@
  28  ## Process w/ automake.  Or, autoreconf; make ##
  29 +AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\""
  30  AUTOMAKE_OPTIONS = foreign
  31  SUBDIRS = . colors doc examples
  32  INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include
  33
  34 -includedir = $(prefix)/include
  35 -colordir = $(libdir)/colors
  36 -
  37  lib_LTLIBRARIES = librsl.la
  38
  39 -librsl_la_LDFLAGS = -version-info 1:40
  40 -librsl_la_SOURCES = \
  41 -$(rapic_c) $(radtec_c)\
  42 -dorade.c dorade_print.c dorade_to_radar.c\
  43 -lassen.c lassen_to_radar.c \
  44 -edge_to_radar.c \
  45 - radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
  46 - range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
  47 - carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
  48 - ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \
  49 - mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \
  50 - gzip.c prune.c reverse.c fix_headers.c \
  51 - nsig_to_radar.c nsig.c nsig2_to_radar.c \
  52 - africa_to_radar.c africa.c \
  53 - radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
  54 - radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
  55 -
  56 -librsl_la_DEPENDENCIES = $(build_headers)
  57 +wsr88ddir = $(datadir)/rsl/
  58 +dist_wsr88d_DATA = wsr88d_locations.dat
  59
  60 -build_headers = rsl.h wsr88d.h toolkit_1BC-51_appl.h
  61 +include_HEADERS = rsl.h toolkit_1BC-51_appl.h
  62
  63  headers = africa.h dorade.h lassen.h \
  64            mcgill.h nsig.h radtec.h rainbow.h \
  65            rapic_routines.h toga.h \
  66 -                 $(build_headers)
  67 +          wsr88d.h \
  68 +         $(include_HEADERS)
  69 +
  70 +librsl_la_LDFLAGS = -version-info 1:40
  71 +librsl_la_SOURCES = \
  72 +    $(rapic_c) $(radtec_c) \
  73 +    dorade.c dorade_print.c dorade_to_radar.c \
  74 +    lassen.c lassen_to_radar.c \
  75 +    edge_to_radar.c \
  76 +    radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
  77 +    range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
  78 +    carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
  79 +    ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \
  80 +    mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \
  81 +    gzip.c prune.c reverse.c fix_headers.c \
  82 +    nsig_to_radar.c nsig.c nsig2_to_radar.c \
  83 +    africa_to_radar.c africa.c \
  84 +    radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
  85 +    radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
  86 +
  87
  88  rapic_c =  rapic_to_radar.c rapic.y rapic-lex.l rapic_routines.c
  89  radtec_c = radtec_to_radar.c radtec.c
  90
  91
  92 -rsl.h: Makefile
  93 -       @for h in $(build_headers); do \
  94 -       echo -n "Checking substitutions in header file $$h ... "; \
  95 -       cp $$h $$h.in; \
  96 -       sed -e 's/RSL_VERSION_STR.*/RSL_VERSION_STR \"$(VERSION)\"/' \
  97 -         -e 's|#define COLORDIR.*|#define COLORDIR \"$(colordir)\"|' \
  98 -         -e 's|#define WSR88D_SITE_INFO_FILE.*|#define WSR88D_SITE_INFO_FILE \"$(libdir)/wsr88d_locations.dat\"|' \
  99 -    < $$h.in > $$h.new; \
 100 -       if cmp -s $$h $$h.new; then \
 101 -       rm $$h.new; \
 102 -       echo "$$h remains untouched."; \
 103 -    else \
 104 -       mv $$h.new $$h; \
 105 -       echo "substitutions made in $$h."; \
 106 -    fi; \
 107 -       rm -f $$h.in; \
 108 -    done
 109 -
 110  PREFIX = rapic
 111  LFLAGS = -P$(PREFIX)
 112  YFLAGS = -d -p $(PREFIX)
 113  LEX_OUTPUT_ROOT = lex.$(PREFIX)
 114
 115 -
 116 -install-exec-hook:
 117 -       $(INSTALL) -d  $(includedir)
 118 -       $(INSTALL) -m 644 rsl.h $(includedir)
 119 -       $(INSTALL) -m 644 toolkit_1BC-51_appl.h $(includedir)
 120 -       $(INSTALL) -m 644 wsr88d_locations.dat $(libdir)
 121 -
 122  EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h
 123
 124  DISTCLEANFILES = rapic.c rapic-lex.c
 125 diff -ru rsl-v1.40/radar.c rsl-v1.40.new/radar.c
 126 --- rsl-v1.40/radar.c   2006-08-09 19:35:53.000000000 +0000
 127 +++ rsl-v1.40.new/radar.c       2008-12-27 11:13:43.000000000 +0000
 128 @@ -60,7 +60,7 @@
 129
 130  void RSL_print_version()
 131  {
 132 -  printf("RSL version %s.\n", RSL_VERSION_STR);
 133 +  printf("RSL version %s.\n", VERSION);
 134  }
 135
 136  /* Debug printing global variable: radar_verbose_flag */
 137 diff -ru rsl-v1.40/radar_to_uf.c rsl-v1.40.new/radar_to_uf.c
 138 --- rsl-v1.40/radar_to_uf.c     2008-04-16 19:34:41.000000000 +0000
 139 +++ rsl-v1.40.new/radar_to_uf.c 2008-12-27 11:13:58.000000000 +0000
 140 @@ -316,7 +316,7 @@
 141                 uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
 142                 uf_ma[38] = tm->tm_mon+1;
 143                 uf_ma[39] = tm->tm_mday;
 144 -               memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
 145 +               memcpy(&uf_ma[40], "RSL" VERSION, 8);
 146                 if (little_endian()) swap2(&uf_ma[40], 8/2);
 147                 uf_ma[44] = (signed short)UF_NO_DATA;
 148                 len_ma = 45;
 149 diff -ru rsl-v1.40/read_write.c rsl-v1.40.new/read_write.c
 150 --- rsl-v1.40/read_write.c      2008-10-07 22:30:06.000000000 +0000
 151 +++ rsl-v1.40.new/read_write.c  2008-12-27 11:14:05.000000000 +0000
 152 @@ -314,7 +314,7 @@
 153    if (radar == NULL) return 0;
 154
 155    memset(title, 0, sizeof(title));
 156 -  (void)sprintf(title, "RSL v%s. sizeof(Range) %d", RSL_VERSION_STR, sizeof(Range));
 157 +  (void)sprintf(title, "RSL v%s. sizeof(Range) %d", VERSION, sizeof(Range));
 158    n += fwrite(title, sizeof(char), sizeof(title), fp);
 159
 160    memset(header_buf, 0, sizeof(header_buf));
 161 diff -ru rsl-v1.40/rsl.h rsl-v1.40.new/rsl.h
 162 --- rsl-v1.40/rsl.h     2008-10-10 20:09:36.000000000 +0000
 163 +++ rsl-v1.40.new/rsl.h 2008-12-27 11:15:24.000000000 +0000
 164 @@ -27,8 +27,6 @@
 165  #include "config.h"
 166  #endif
 167
 168 -#define RSL_VERSION_STR "v1.40"
 169 -
 170  /**********************************************************************/
 171  /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
 172  /*            values with two bytes.  Otherwise, use one byte.        */
 173 @@ -46,7 +44,7 @@
 174  /*            so you shouldn't have to modify anything here.          */
 175  /**********************************************************************/
 176  #ifndef COLORDIR
 177 -#define COLORDIR "/usr/local/trmm/GVBOX/lib/colors"
 178 +#define COLORDIR DATADIR "/colors"
 179  #endif
 180
 181  /* These are the color table indexes. See RSL_set/get_color_table. */
 182 @@ -57,18 +55,18 @@
 183  /* The default color tables for reflectivity, velocity, spectral width,
 184   * height, rainfall, and zdr.
 185   */
 186 -#define REFL_RED_FILE   COLORDIR "/red_reflectivity.clr"
 187 -#define REFL_GREEN_FILE COLORDIR "/grn_reflectivity.clr"
 188 -#define REFL_BLUE_FILE  COLORDIR "/blu_reflectivity.clr"
 189 -#define VEL_RED_FILE    COLORDIR "/red_velocity.clr"
 190 -#define VEL_GREEN_FILE  COLORDIR "/grn_velocity.clr"
 191 -#define VEL_BLUE_FILE   COLORDIR "/blu_velocity.clr"
 192 -#define SW_RED_FILE     COLORDIR "/red_spectral_width.clr"
 193 -#define SW_GREEN_FILE   COLORDIR "/grn_spectral_width.clr"
 194 -#define SW_BLUE_FILE    COLORDIR "/blu_spectral_width.clr"
 195 -#define HEIGHT_RED_FILE   COLORDIR "/red_height.clr"
 196 -#define HEIGHT_GREEN_FILE COLORDIR "/grn_height.clr"
 197 -#define HEIGHT_BLUE_FILE  COLORDIR "/blu_height.clr"
 198 +#define REFL_RED_FILE       COLORDIR "/red_reflectivity.clr"
 199 +#define REFL_GREEN_FILE     COLORDIR "/grn_reflectivity.clr"
 200 +#define REFL_BLUE_FILE      COLORDIR "/blu_reflectivity.clr"
 201 +#define VEL_RED_FILE        COLORDIR "/red_velocity.clr"
 202 +#define VEL_GREEN_FILE      COLORDIR "/grn_velocity.clr"
 203 +#define VEL_BLUE_FILE       COLORDIR "/blu_velocity.clr"
 204 +#define SW_RED_FILE         COLORDIR "/red_spectral_width.clr"
 205 +#define SW_GREEN_FILE       COLORDIR "/grn_spectral_width.clr"
 206 +#define SW_BLUE_FILE        COLORDIR "/blu_spectral_width.clr"
 207 +#define HEIGHT_RED_FILE     COLORDIR "/red_height.clr"
 208 +#define HEIGHT_GREEN_FILE   COLORDIR "/grn_height.clr"
 209 +#define HEIGHT_BLUE_FILE    COLORDIR "/blu_height.clr"
 210  #define RAINFALL_RED_FILE   COLORDIR "/red_rainfall.clr"
 211  #define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
 212  #define RAINFALL_BLUE_FILE  COLORDIR "/blu_rainfall.clr"
 213 diff -ru rsl-v1.40/wsr88d.h rsl-v1.40.new/wsr88d.h
 214 --- rsl-v1.40/wsr88d.h  2004-03-12 17:12:09.000000000 +0000
 215 +++ rsl-v1.40.new/wsr88d.h      2008-12-27 11:16:01.000000000 +0000
 216 @@ -7,7 +7,7 @@
 217   * The directory should be the same as the LIBDIR in the makefile.
 218   */
 219  #ifndef WSR88D_SITE_INFO_FILE
 220 -#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/GVBOX/lib/wsr88d_locations.dat"
 221 +#define WSR88D_SITE_INFO_FILE DATADIR "/wsr88d_locations.dat"
 222  #endif
 223  /*===============================================================*/
 224  typedef struct {