Merge branch 'master' into aweather

[~andy/rsl] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d333a37ead5bb22e78a77e950793934484a97f2c..cfebc954e9aba9ee216992a21677152f8f9f091f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I. -I..
+M_CPPFLAGS = -I. -I..
 AM_YFLAGS = -d
 
 lib_LTLIBRARIES = librsl.la
@@ -11,8 +11,8 @@ headers = africa.h dorade.h lassen.h \
          wsr88d.h \
          $(include_HEADERS)
 
-librsl_la_LDFLAGS  = -version-info 1:42
-librsl_la_CPPFLAGS = -DDATADIRRSL="\"$(dots)$(datadir)/rsl1\""
+librsl_la_LDFLAGS  = -version-info 1:44
+librsl_la_CPPFLAGS = -DDATADIRRSL="\"$(DOTS)$(datadir)/rsl1\""
 librsl_la_SOURCES  = \
        rapic_parse.y rapic_scan.l rapic_to_radar.c rapic_routines.c \
        radtec.c radtec_to_radar.c \
@@ -24,16 +24,17 @@ librsl_la_SOURCES  = \
        ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \
        mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \
        prune.c reverse.c fix_headers.c \
+       wsr88d_align_split_cut_rays.c \
+       wsr88d_merge_split_cuts.c \
        nsig_to_radar.c nsig.c nsig2_to_radar.c \
        africa_to_radar.c africa.c \
        radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
        radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
 
-if WIN32
+if SYS_WIN
 librsl_la_LDFLAGS += -mwindows -no-undefined
 librsl_la_LIBADD   = -lws2_32
 librsl_la_SOURCES += gzip_win32.c 
-dots               = ..
 else
 librsl_la_SOURCES += gzip.c 
 endif