[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] (no subject)
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] (no subject) |
|
Date: |
Mon, 30 May 2016 04:33:47 +0000 (UTC) |
branch: master
commit 11318bce6a9415fbefe7457b3ce37895c2b8c0a4
Author: Mohammad Akhlaghi <address@hidden>
Date: Mon May 30 11:41:49 2016 +0900
Unnecessary include flag (-I) removed in all Makefile.ams
The `-I$(top_builddir)/bootstrapped/lib' flag that was given to
`AM_CPPFLAGS' in all the Makefiles has been removed. Gnulib's header files
are all in the `$(top_srcdir)/bootstrapped/lib' directory, not in the
`builddir'. Including this was a mistake some time ago, and since it didn't
cause any errors, it was never removed. It might cause confusion (leading
an unexpecting reader to think that some of the header files are generated
by the build process, while they aren't).
Also, the spacing from the top comments of the `Makefile.am's was not
uniform, so the top uncommented line of the `Makefile.am's was set to be 5
lines below the comment.
---
lib/Makefile.am | 9 ++++++++-
src/arithmetic/Makefile.am | 6 +++++-
src/convertt/Makefile.am | 9 ++++++++-
src/convolve/Makefile.am | 5 ++++-
src/cosmiccal/Makefile.am | 3 ++-
src/header/Makefile.am | 3 ++-
src/imgcrop/Makefile.am | 5 ++++-
src/imgstat/Makefile.am | 6 +++++-
src/imgwarp/Makefile.am | 6 +++++-
src/mkcatalog/Makefile.am | 3 ++-
src/mknoise/Makefile.am | 6 +++++-
src/mkprof/Makefile.am | 5 ++++-
src/noisechisel/Makefile.am | 6 +++++-
src/subtractsky/Makefile.am | 6 +++++-
14 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 272eec6..440c69c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,13 +18,20 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
LDADD = bootstrapped/lib/libgnu.a
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
+
+
+
## Make libraries of the files that are shared between all the
diff --git a/src/arithmetic/Makefile.am b/src/arithmetic/Makefile.am
index 49dd8a7..875c9a6 100644
--- a/src/arithmetic/Makefile.am
+++ b/src/arithmetic/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/convertt/Makefile.am b/src/convertt/Makefile.am
index bb9f0c0..66383b8 100644
--- a/src/convertt/Makefile.am
+++ b/src/convertt/Makefile.am
@@ -18,19 +18,26 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
+# Check if the system has libjpeg installed.
if COND_HASLIBJPEG
MAYBE_HASLIBJPEG = -ljpeg
endif
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lm $(MAYBE_HASLIBJPEG) -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/convolve/Makefile.am b/src/convolve/Makefile.am
index 52b3049..1e60893 100644
--- a/src/convolve/Makefile.am
+++ b/src/convolve/Makefile.am
@@ -19,13 +19,16 @@
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/cosmiccal/Makefile.am b/src/cosmiccal/Makefile.am
index 0e40263..6f5d7b0 100644
--- a/src/cosmiccal/Makefile.am
+++ b/src/cosmiccal/Makefile.am
@@ -21,13 +21,14 @@
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/header/Makefile.am b/src/header/Makefile.am
index 9c4f62e..874e8e1 100644
--- a/src/header/Makefile.am
+++ b/src/header/Makefile.am
@@ -21,13 +21,14 @@
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/imgcrop/Makefile.am b/src/imgcrop/Makefile.am
index 6532e6c..555db6d 100644
--- a/src/imgcrop/Makefile.am
+++ b/src/imgcrop/Makefile.am
@@ -19,13 +19,16 @@
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/imgstat/Makefile.am b/src/imgstat/Makefile.am
index 474917a..e6f4cbd 100644
--- a/src/imgstat/Makefile.am
+++ b/src/imgstat/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/imgwarp/Makefile.am b/src/imgwarp/Makefile.am
index 3188709..48db3b5 100644
--- a/src/imgwarp/Makefile.am
+++ b/src/imgwarp/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/mkcatalog/Makefile.am b/src/mkcatalog/Makefile.am
index 34828c3..4b05d96 100644
--- a/src/mkcatalog/Makefile.am
+++ b/src/mkcatalog/Makefile.am
@@ -21,13 +21,14 @@
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/mknoise/Makefile.am b/src/mknoise/Makefile.am
index 959623f..9ec103d 100644
--- a/src/mknoise/Makefile.am
+++ b/src/mknoise/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/mkprof/Makefile.am b/src/mkprof/Makefile.am
index 14c64b3..42f113e 100644
--- a/src/mkprof/Makefile.am
+++ b/src/mkprof/Makefile.am
@@ -19,13 +19,16 @@
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lgsl -lgslcblas -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/noisechisel/Makefile.am b/src/noisechisel/Makefile.am
index 734008e..9a54c00 100644
--- a/src/noisechisel/Makefile.am
+++ b/src/noisechisel/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib
diff --git a/src/subtractsky/Makefile.am b/src/subtractsky/Makefile.am
index 77f75d9..a7667f6 100644
--- a/src/subtractsky/Makefile.am
+++ b/src/subtractsky/Makefile.am
@@ -18,13 +18,17 @@
## You should have received a copy of the GNU General Public License
## along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
# Flags:
AM_CFLAGS = -Wall -O3
AM_LDFLAGS = -lcfitsio -lwcs -lm -L$(top_builddir)/lib
AM_CPPFLAGS = -DSYSCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/lib \
--I$(top_builddir)/bootstrapped/lib -I$(top_srcdir)/bootstrapped/lib
+ -I$(top_srcdir)/bootstrapped/lib