file moving

Makefile.am → libmr_util/Makefile.am

@@ -3,48 +3,45 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libmrutil.la
 
 libmrutil_la_SOURCES = \
-  libsharp2/sharp.cc \
-  libsharp2/sharp_almhelpers.cc \
-  libsharp2/sharp_core.cc \
-  libsharp2/sharp_geomhelpers.cc \
-  libsharp2/sharp_ylmgen.cc \
-  libsharp2/sharp_internal.h \
-  mr_util/math_utils.h \
-  mr_util/cmplx.h \
-  mr_util/aligned_array.h \
-  mr_util/simd.h \
-  mr_util/pointing.cc \
-  mr_util/pointing.h \
-  mr_util/vec3.h \
-  mr_util/constants.h \
-  mr_util/error_handling.h \
-  mr_util/space_filling.cc \
-  mr_util/space_filling.h \
-  mr_util/fft1d.h \
-  mr_util/fft.h \
-  mr_util/gl_integrator.h \
-  mr_util/mav.h \
-  mr_util/string_utils.cc \
-  mr_util/string_utils.h \
-  mr_util/system.cc \
-  mr_util/system.h \
-  mr_util/threading.cc \
-  mr_util/threading.h \
-  mr_util/timers.h \
-  mr_util/unity_roots.h \
-  mr_util/useful_macros.h \
-  mr_util/rangeset.h \
-  mr_util/crangeset.h \
-  mr_util/compress_utils.h \
+  mr_util/sharp/sharp.cc \
+  mr_util/sharp/sharp_almhelpers.cc \
+  mr_util/sharp/sharp_core.cc \
+  mr_util/sharp/sharp_geomhelpers.cc \
+  mr_util/sharp/sharp_ylmgen.cc \
+  mr_util/sharp/sharp_internal.h \
+  mr_util/math/math_utils.h \
+  mr_util/math/cmplx.h \
+  mr_util/infra/aligned_array.h \
+  mr_util/infra/simd.h \
+  mr_util/math/pointing.cc \
+  mr_util/math/pointing.h \
+  mr_util/math/vec3.h \
+  mr_util/math/constants.h \
+  mr_util/infra/error_handling.h \
+  mr_util/math/space_filling.cc \
+  mr_util/math/space_filling.h \
+  mr_util/math/fft1d.h \
+  mr_util/math/fft.h \
+  mr_util/math/gl_integrator.h \
+  mr_util/infra/mav.h \
+  mr_util/infra/string_utils.cc \
+  mr_util/infra/string_utils.h \
+  mr_util/infra/system.cc \
+  mr_util/infra/system.h \
+  mr_util/infra/threading.cc \
+  mr_util/infra/threading.h \
+  mr_util/infra/timers.h \
+  mr_util/math/unity_roots.h \
+  mr_util/infra/useful_macros.h \
+  mr_util/math/rangeset.h \
   mr_util/geom_utils.h \
-  mr_util/geom_utils.cc \
-  Healpix_cxx/healpix_tables.h \
-  Healpix_cxx/healpix_tables.cc \
-  Healpix_cxx/healpix_base.h \
-  Healpix_cxx/healpix_base.cc \
-  Healpix_cxx/healpix_map.h \
-  Healpix_cxx/healpix_map.cc \
-  Healpix_cxx/moc.h
+  mr_util/math/geom_utils.cc \
+  mr_util/healpix/healpix_tables.h \
+  mr_util/healpix/healpix_tables.cc \
+  mr_util/healpix/healpix_base.h \
+  mr_util/healpix/healpix_base.cc \
+  mr_util/healpix/healpix_map.h \
+  mr_util/healpix/healpix_map.cc
 
 # format is "current:revision:age"
 # any change: increase revision
@@ -58,11 +55,11 @@ AM_CXXFLAGS = @AM_CXXFLAGS@
 
 if HAVE_MULTIARCH
 
-libavx_la_SOURCES = libsharp2/sharp_core_inc.cc
-libavx2_la_SOURCES = libsharp2/sharp_core_inc.cc
-libfma_la_SOURCES = libsharp2/sharp_core_inc.cc
-libfma4_la_SOURCES = libsharp2/sharp_core_inc.cc
-libavx512f_la_SOURCES = libsharp2/sharp_core_inc.cc
+libavx_la_SOURCES = mr_util/sharp/sharp_core_inc.cc
+libavx2_la_SOURCES = mr_util/sharp/sharp_core_inc.cc
+libfma_la_SOURCES = mr_util/sharp/sharp_core_inc.cc
+libfma4_la_SOURCES = mr_util/sharp/sharp_core_inc.cc
+libavx512f_la_SOURCES = mr_util/sharp/sharp_core_inc.cc
 
 noinst_LTLIBRARIES = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
 
@@ -77,9 +74,9 @@ libmrutil_la_LIBADD = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
 endif
 
 nobase_include_HEADERS = \
-  libsharp2/sharp.h \
-  libsharp2/sharp_geomhelpers.h \
-  libsharp2/sharp_almhelpers.h
+  mr_util/sharp/sharp.h \
+  mr_util/sharp/sharp_geomhelpers.h \
+  mr_util/sharp/sharp_almhelpers.h
 
 EXTRA_DIST = test/test_libsharp.sh test/test_space_filling.sh
 

libmr_util/mr_util

+../src/mr_util/
\ No newline at end of file