#1581 Cleanup libraries

dtcenter · Apr 16, 2021 · 793f320 · 793f320
1 parent a538121
commit 793f320
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 49 deletions.
diff --git a/met/src/tools/core/ensemble_stat/Makefile.am b/met/src/tools/core/ensemble_stat/Makefile.am
@@ -24,20 +24,20 @@ ensemble_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
-	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
-        -lvx_statistics \
+	$(PYTHON_LIBS) \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 
 EXTRA_DIST = ensemble_stat.h \

diff --git a/met/src/tools/core/point_stat/Makefile.am b/met/src/tools/core/point_stat/Makefile.am
@@ -18,26 +18,26 @@ point_stat_LDFLAGS = ${MET_LDFLAGS}
 point_stat_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_shapedata \
-	-lvx_gsl_prob \
 	-lvx_analysis_util \
 	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
-	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
-	-lvx_statistics \
+	$(PYTHON_LIBS) \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
-	-lvx_cal \
+	-lvx_gsl_prob \
+	-lvx_color \
 	-lvx_util \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 
 EXTRA_DIST = point_stat.h \

diff --git a/met/src/tools/other/ascii2nc/Makefile.am b/met/src/tools/other/ascii2nc/Makefile.am
@@ -31,30 +31,28 @@ ascii2nc_LDFLAGS = ${MET_LDFLAGS}
 ascii2nc_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_shapedata \
-	-lvx_gsl_prob \
 	-lvx_analysis_util \
 	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
-	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
+	-lvx_summary \
+	-lvx_pb_util \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_pb_util \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
-	$(PYTHON_LIBS) \
+	-lvx_cal \
 	-lvx_math \
-	-lvx_color \
 	-lvx_log \
-	-lvx_summary \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 
 

diff --git a/met/src/tools/other/ioda2nc/Makefile.am b/met/src/tools/other/ioda2nc/Makefile.am
@@ -18,30 +18,28 @@ ioda2nc_LDFLAGS = ${MET_LDFLAGS}
 ioda2nc_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_shapedata \
-	-lvx_gsl_prob \
 	-lvx_analysis_util \
 	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
-	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
+	-lvx_pb_util \
+	-lvx_summary \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_pb_util \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
-	$(PYTHON_LIBS) \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
-	-lvx_summary \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \
 	$(FLIBS)
 
diff --git a/met/src/tools/other/madis2nc/Makefile.am b/met/src/tools/other/madis2nc/Makefile.am
@@ -17,30 +17,28 @@ madis2nc_LDFLAGS = ${MET_LDFLAGS}
 madis2nc_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_shapedata \
-	-lvx_gsl_prob \
 	-lvx_analysis_util \
 	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
-	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
+	-lvx_pb_util \
+	-lvx_summary \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_pb_util \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
-	$(PYTHON_LIBS) \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
-	-lvx_summary \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 
 EXTRA_DIST = madis2nc.h \

diff --git a/met/src/tools/other/pb2nc/Makefile.am b/met/src/tools/other/pb2nc/Makefile.am
@@ -42,22 +42,21 @@ pb2nc_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
-	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
+	-lvx_pb_util \
+	-lvx_summary \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_pb_util \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
-	$(PYTHON_LIBS) \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
-	-lvx_summary \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \
 	$(FLIBS)
 

diff --git a/met/src/tools/other/plot_point_obs/Makefile.am b/met/src/tools/other/plot_point_obs/Makefile.am
@@ -21,29 +21,29 @@ plot_point_obs_LDADD = -lvx_statistics \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
-	-lvx_nc_util \
+	$(PYTHON_LIBS) \
 	-lvx_data2d \
-        -lvx_nc_obs \
-        -lvx_nc_util \
+	-lvx_nc_util \
+	-lvx_statistics \
+	-lvx_nc_obs \
+	-lvx_nc_util \
 	-lvx_gnomon \
 	-lvx_regrid \
 	-lvx_plot_util \
 	-lvx_render \
 	-lvx_pxm \
-	-lvx_color \
 	-lvx_ps \
 	-lvx_afm \
 	-lvx_nav \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
-	$(PYTHON_LIBS) \
-	-lvx_statistics \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 EXTRA_DIST = plot_point_obs.h \
 	plot_point_obs_conf_info.h

diff --git a/met/src/tools/other/point2grid/Makefile.am b/met/src/tools/other/point2grid/Makefile.am
@@ -20,20 +20,20 @@ point2grid_LDADD = -lvx_statistics \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
-	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
-	-lvx_statistics \
+	$(PYTHON_LIBS) \
+	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_nc_obs \
-	-lvx_data2d \
 	-lvx_gnomon \
 	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
-	-lvx_cal \
+	-lvx_color \
 	-lvx_util \
 	-lvx_math \
-	-lvx_color \
+	-lvx_cal \
 	-lvx_log \
+	$(PYTHON_LIBS) \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas