[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master ae7a125: Header and file corrections after cle
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master ae7a125: Header and file corrections after clean bootsrap and build |
Date: |
Mon, 24 Apr 2017 11:49:59 -0400 (EDT) |
branch: master
commit ae7a125de57497001d06862121ec38b51c0c8088
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Header and file corrections after clean bootsrap and build
After the previous commit, I noticed that old library headers still existed
on my system so on my computer, the existence of such headers wouldn't
cause any problem but on others it would. As a result I manually deleted
all the installed Gnuastro libraries and headers from my system, completely
cleaned the version controlled directory (with `git clean -fxd') and
bootstrapped and re-built Gnuastro again. I found several additional cases
of old headers that no longer existed in the source code and remove them.
Since the `.in' files are automatically excluded from the `git status'
outputs, I hadn't noticed that the `lib/gnuastro-internal/config.h.in' file
was not version controlled. So this commit also includes this file in the
Git history (before it was in the `lib/' directory, but all internal
headers were later moved to the `lib/gnuastro-internal' directory and this
file was missed).
---
bin/arithmetic/arithmetic.c | 1 -
bin/arithmetic/operands.c | 1 -
bin/convertt/convertt.c | 1 -
bin/convolve/convolve.c | 1 -
bin/crop/wcsmode.c | 2 +-
bin/mkprof/mkprof.c | 2 -
bin/mkprof/oneprofile.c | 1 -
bin/statistics/sky.c | 3 +-
lib/gnuastro-internal/config.h.in | 78 +++++++++++++++++++++++++++++++++++++++
9 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/bin/arithmetic/arithmetic.c b/bin/arithmetic/arithmetic.c
index 50ecb9c..71a65cc 100644
--- a/bin/arithmetic/arithmetic.c
+++ b/bin/arithmetic/arithmetic.c
@@ -30,7 +30,6 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
-#include <gnuastro/array.h>
#include <gnuastro/arithmetic.h>
#include <gnuastro-internal/checkset.h>
diff --git a/bin/arithmetic/operands.c b/bin/arithmetic/operands.c
index 7402ceb..15de9bb 100644
--- a/bin/arithmetic/operands.c
+++ b/bin/arithmetic/operands.c
@@ -31,7 +31,6 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/wcs.h>
#include <gnuastro/fits.h>
-#include <gnuastro/array.h>
#include "main.h"
diff --git a/bin/convertt/convertt.c b/bin/convertt/convertt.c
index f96a410..93682a3 100644
--- a/bin/convertt/convertt.c
+++ b/bin/convertt/convertt.c
@@ -31,7 +31,6 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/txt.h>
#include <gnuastro/fits.h>
-#include <gnuastro/txtarray.h>
#include <gnuastro/arithmetic.h>
#include <gnuastro-internal/timing.h>
diff --git a/bin/convolve/convolve.c b/bin/convolve/convolve.c
index 0680097..eff74b9 100644
--- a/bin/convolve/convolve.c
+++ b/bin/convolve/convolve.c
@@ -34,7 +34,6 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/threads.h>
#include <gnuastro/convolve.h>
-#include <gnuastro/spatialconvolve.h>
#include <gnuastro-internal/timing.h>
diff --git a/bin/crop/wcsmode.c b/bin/crop/wcsmode.c
index ccc8c92..3d7a264 100644
--- a/bin/crop/wcsmode.c
+++ b/bin/crop/wcsmode.c
@@ -70,7 +70,7 @@ wcs_check_prepare(struct cropparams *p, struct inputimgs *img)
img->name, p->cp.hdu, img->name, p->cp.hdu);
if(wcs->pc[0]>0)
error(EXIT_FAILURE, 0, "%s: HDU %s: An increase in the first "
- "FITS axis pixel coordinates should be a decrese in the "
+ "FITS axis pixel coordinates should be a decrease in the "
"RA. You have to flip the image along the second axis "
"before running Crop", img->name, p->cp.hdu);
if(wcs->pc[3]<0)
diff --git a/bin/mkprof/mkprof.c b/bin/mkprof/mkprof.c
index cd6f011..7317e22 100644
--- a/bin/mkprof/mkprof.c
+++ b/bin/mkprof/mkprof.c
@@ -32,9 +32,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/box.h>
#include <gnuastro/git.h>
#include <gnuastro/fits.h>
-#include <gnuastro/array.h>
#include <gnuastro/threads.h>
-#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
#include <gnuastro-internal/timing.h>
diff --git a/bin/mkprof/oneprofile.c b/bin/mkprof/oneprofile.c
index 9941f92..a423871 100644
--- a/bin/mkprof/oneprofile.c
+++ b/bin/mkprof/oneprofile.c
@@ -34,7 +34,6 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_integration.h> /* gsl_integration_qng */
#include <gnuastro/fits.h>
-#include <gnuastro/array.h>
#include <gnuastro/dimension.h>
#include <gnuastro/statistics.h>
#include <gnuastro/linkedlist.h>
diff --git a/bin/statistics/sky.c b/bin/statistics/sky.c
index a242a44..fc20a17 100644
--- a/bin/statistics/sky.c
+++ b/bin/statistics/sky.c
@@ -29,10 +29,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
-#include <gnuastro/mesh.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/array.h>
#include <gnuastro/blank.h>
+#include <gnuastro/threads.h>
#include <gnuastro/convolve.h>
#include <gnuastro/statistics.h>
#include <gnuastro/interpolate.h>
diff --git a/lib/gnuastro-internal/config.h.in
b/lib/gnuastro-internal/config.h.in
new file mode 100644
index 0000000..0a094c9
--- /dev/null
+++ b/lib/gnuastro-internal/config.h.in
@@ -0,0 +1,78 @@
+/*********************************************************************
+Functions dealing with general aspects of all Gnuastro.
+
+Original author:
+ Mohammad Akhlaghi <address@hidden>
+Contributing author(s):
+Copyright (C) 2016, Free Software Foundation, Inc.
+
+Gnuastro is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+Gnuastro 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 General Public License
+along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+**********************************************************************/
+#ifndef __GAL_CONFIG_H__
+#define __GAL_CONFIG_H__
+
+/* Include other headers if necessary here. Note that other header files
+ must be included before the C++ preparations below */
+
+
+
+/* Configuration macros: */
+
+#define GAL_CONFIG_VERSION "@VERSION@"
+
+#define GAL_CONFIG_HAVE_LIBGIT2 @HAVE_LIBGIT2@
+
+#define GAL_CONFIG_HAVE_WCSLIB_VERSION @HAVE_WCSLIB_VERSION@
+
+#define GAL_CONFIG_HAVE_PTHREAD_BARRIER @HAVE_PTHREAD_BARRIER@
+
+#define GAL_CONFIG_BIN_OP_UINT8 @HAVE_BIN_OP_UINT8@
+#define GAL_CONFIG_BIN_OP_INT8 @HAVE_BIN_OP_INT8@
+#define GAL_CONFIG_BIN_OP_UINT16 @HAVE_BIN_OP_UINT16@
+#define GAL_CONFIG_BIN_OP_INT16 @HAVE_BIN_OP_INT16@
+#define GAL_CONFIG_BIN_OP_UINT32 @HAVE_BIN_OP_UINT32@
+#define GAL_CONFIG_BIN_OP_INT32 @HAVE_BIN_OP_INT32@
+#define GAL_CONFIG_BIN_OP_UINT64 @HAVE_BIN_OP_UINT64@
+#define GAL_CONFIG_BIN_OP_INT64 @HAVE_BIN_OP_INT64@
+#define GAL_CONFIG_BIN_OP_FLOAT32 @HAVE_BIN_OP_FLOAT32@
+#define GAL_CONFIG_BIN_OP_FLOAT64 @HAVE_BIN_OP_FLOAT64@
+
+#define GAL_CONFIG_SIZEOF_SIZE_T @SIZEOF_SIZE_T@
+
+
+/* C++ Preparations */
+#undef __BEGIN_C_DECLS
+#undef __END_C_DECLS
+#ifdef __cplusplus
+# define __BEGIN_C_DECLS extern "C" {
+# define __END_C_DECLS }
+#else
+# define __BEGIN_C_DECLS /* empty */
+# define __END_C_DECLS /* empty */
+#endif
+/* End of C++ preparations */
+
+
+
+/* Actual header contants (the above were for the Pre-processor). */
+__BEGIN_C_DECLS /* From C++ preparations */
+
+
+
+
+
+
+__END_C_DECLS /* From C++ preparations */
+
+#endif /* __GAL_CONFIG_H__ */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnuastro-commits] master ae7a125: Header and file corrections after clean bootsrap and build,
Mohammad Akhlaghi <=