diff --git a/Makefile.am b/Makefile.am index 05077f2a..da9ef488 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib \ src \ - tools/make_regional_mosaic \ tools/make_solo_mosaic \ tools/make_topog \ tools/make_vgrid \ diff --git a/configure.ac b/configure.ac index 6cffeff6..0c3dd52c 100644 --- a/configure.ac +++ b/configure.ac @@ -261,7 +261,6 @@ AC_CONFIG_FILES([Makefile man/Makefile src/Makefile tests/Makefile - tools/make_regional_mosaic/Makefile tools/make_solo_mosaic/Makefile tools/make_topog/Makefile tools/make_vgrid/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 0dd138b7..5e3e60d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ grid_programs = \ make_coupler_mosaic \ make_hgrid \ make_land_domain \ + make_regional_mosaic \ make_remap_file \ make_quick_mosaic @@ -334,3 +335,9 @@ make_land_domain_SOURCES = \ # ********************************************************* # make_quick_mosaic_SOURCES = \ make-quick-mosaic/make_quick_mosaic.c + +# ********************************************************* # +# make_regional_mosaic # +# ********************************************************* # +make_regional_mosaic_SOURCES = \ + make-regional-mosaic/make_regional_mosaic.c diff --git a/tools/make_regional_mosaic/CHANGELOG b/src/make-regional-mosaic/CHANGELOG similarity index 100% rename from tools/make_regional_mosaic/CHANGELOG rename to src/make-regional-mosaic/CHANGELOG diff --git a/tools/make_regional_mosaic/make_regional_mosaic.c b/src/make-regional-mosaic/make_regional_mosaic.c similarity index 100% rename from tools/make_regional_mosaic/make_regional_mosaic.c rename to src/make-regional-mosaic/make_regional_mosaic.c diff --git a/tools/make_regional_mosaic/Makefile.am b/tools/make_regional_mosaic/Makefile.am deleted file mode 100644 index a29143c9..00000000 --- a/tools/make_regional_mosaic/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -#*********************************************************************** -# GNU Lesser General Public License -# -# This file is part of the GFDL FRE NetCDF tools package (FRE-NCTools). -# -# FRE-NCTools is free software: you can redistribute it and/or modify it under -# the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at -# your option) any later version. -# -# FRE-NCTools is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with FRE-NCTools. If not, see -# . -#*********************************************************************** -bin_PROGRAMS = make_regional_mosaic - -AM_CFLAGS = -I$(top_srcdir)/lib/libfrencutils \ - $(NETCDF_CFLAGS) -LDADD = $(top_builddir)/lib/libfrencutils/libfrencutils.a \ - $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS) - -make_regional_mosaic_SOURCES = make_regional_mosaic.c