[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master 547eb4f: Static and shared libraries are now i
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] master 547eb4f: Static and shared libraries are now installed |
|
Date: |
Sun, 28 Aug 2016 00:28:48 +0000 (UTC) |
branch: master
commit 547eb4f604b59b8487200b15ffad0462bdd20ee3
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Static and shared libraries are now installed
As part of task #13765, the libraries are now installed along with the
utilities in the relevant system directories. The task greatly simplified
the Makefiles: all the utilities now only need one link option:
`-lgnuastro', instead of linking with all the separate libraries in one
option.
This does not yet complete `task #13765'. A new libraries chapter has to be
included in the book before we can mark that task as complete.
---
lib/Makefile.am | 59 +++++++++++++------------------------------
src/TEMPLATE/Makefile.am | 3 +--
src/arithmetic/Makefile.am | 3 +--
src/convertt/Makefile.am | 4 +--
src/convolve/Makefile.am | 5 +---
src/cosmiccal/Makefile.am | 3 +--
src/header/Makefile.am | 3 +--
src/imgcrop/Makefile.am | 4 +--
src/imgstat/Makefile.am | 4 +--
src/imgwarp/Makefile.am | 4 +--
src/mkcatalog/Makefile.am | 4 +--
src/mknoise/Makefile.am | 3 +--
src/mkprof/Makefile.am | 4 +--
src/noisechisel/Makefile.am | 4 +--
src/subtractsky/Makefile.am | 4 +--
src/table/Makefile.am | 3 +--
16 files changed, 32 insertions(+), 82 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 29172b8..aa64c58 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,49 +21,24 @@
+# Define the main library file
+lib_LTLIBRARIES = libgnuastro.la
-## Make libraries of the files that are shared between all the
-## programs:
-headersdir=$(top_srcdir)/lib/gnuastro
-noinst_LTLIBRARIES = libgalconfigfiles.la libgalfits.la libgaltxtarray.la \
-libgalcheckset.la libgallinkedlist.la libgaltiming.la libgalthreads.la \
-libgalbox.la libgalarraymanip.la libgalstatistics.la \
-libgalspatialconvolve.la libgalmesh.la libgalmode.la libgalqsort.la \
-libgalpolygon.la libgalwcs.la
-
-libgalbox_la_SOURCES = box.c $(headersdir)/box.h
-
-libgalwcs_la_SOURCES = wcs.c $(headersdir)/wcs.h
-
-libgalfits_la_SOURCES = fits.c $(headersdir)/fits.h
-
-libgalmesh_la_SOURCES = mesh.c $(headersdir)/mesh.h
-
-libgalmode_la_SOURCES = mode.c $(headersdir)/mode.h
-
-libgalqsort_la_SOURCES = qsort.c $(headersdir)/qsort.h
-
-libgaltiming_la_SOURCES = timing.c $(headersdir)/timing.h
-
-libgalpolygon_la_SOURCES = polygon.c $(headersdir)/polygon.h
-libgalthreads_la_SOURCES = threads.c $(headersdir)/threads.h
+# Specify the library .c files
+libgnuastro_la_SOURCES = arraymanip.c box.c checkset.c configfiles.c \
+ fits.c linkedlist.c mesh.c mode.c polygon.c qsort.c spatialconvolve.c
\
+ statistics.c threads.c timing.c txtarray.c wcs.c
-libgalcheckset_la_SOURCES = checkset.c $(headersdir)/checkset.h
-libgaltxtarray_la_SOURCES = txtarray.c $(headersdir)/txtarray.h
-
-libgallinkedlist_la_SOURCES = linkedlist.c $(headersdir)/linkedlist.h
-
-libgalstatistics_la_SOURCES = statistics.c $(headersdir)/statistics.h
-
-libgalarraymanip_la_SOURCES = arraymanip.c $(headersdir)/arraymanip.h
-
-libgalconfigfiles_la_SOURCES = configfiles.c $(headersdir)/configfiles.h
-
-
-
-# Dependent libraries:
-libgalspatialconvolve_la_SOURCES = spatialconvolve.c \
- $(headersdir)/spatialconvolve.h
-libgalspatialconvolve_la_LDFLAGS = -lgalthreads -lgalbox
+# Specify the installed headers, note that we are not blindly including all
+# `.h' files in the headersdir directory. Some of the header files don't
+# need to be installed.
+headersdir=$(top_srcdir)/lib/gnuastro
+pkginclude_HEADERS = $(headersdir)/arraymanip.h $(headersdir)/box.h \
+ $(headersdir)/checkset.h $(headersdir)/configfiles.h \
+ $(headersdir)/fits.h $(headersdir)/linkedlist.h $(headersdir)/mesh.h \
+ $(headersdir)/mode.h $(headersdir)/polygon.h $(headersdir)/qsort.h \
+ $(headersdir)/spatialconvolve.h $(headersdir)/statistics.h \
+ $(headersdir)/threads.h $(headersdir)/timing.h $(headersdir)/txtarray.h \
+ $(headersdir)/wcs.h
diff --git a/src/TEMPLATE/Makefile.am b/src/TEMPLATE/Makefile.am
index 29fecb6..7eccf85 100644
--- a/src/TEMPLATE/Makefile.am
+++ b/src/TEMPLATE/Makefile.am
@@ -29,8 +29,7 @@ astTEMPLATE_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
TEMPLATE.c TEMPLATE.h
astTEMPLATE_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist
-
+-lgnuastro
diff --git a/src/arithmetic/Makefile.am b/src/arithmetic/Makefile.am
index 31e22ae..4cbd672 100644
--- a/src/arithmetic/Makefile.am
+++ b/src/arithmetic/Makefile.am
@@ -29,8 +29,7 @@ astarithmetic_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
arithmetic.c arithmetic.h
astarithmetic_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist \
--lgalmode -lgalstatistics -lgalarraymanip -lgalqsort
+-lgnuastro
diff --git a/src/convertt/Makefile.am b/src/convertt/Makefile.am
index d8ad89a..e2afb5d 100644
--- a/src/convertt/Makefile.am
+++ b/src/convertt/Makefile.am
@@ -29,9 +29,7 @@ astconvertt_SOURCES = main.c main.h args.h cite.h ui.c ui.h
eps.c \
eps.h jpeg.c jpeg.h convertt.c convertt.h
astconvertt_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgaltxtarray -lgalcheckset -lgaltiming \
--lgallinkedlist -lgalstatistics -lgalarraymanip -lgalqsort
-
+-lgnuastro
diff --git a/src/convolve/Makefile.am b/src/convolve/Makefile.am
index a747207..e255bed 100644
--- a/src/convolve/Makefile.am
+++ b/src/convolve/Makefile.am
@@ -29,10 +29,7 @@ astconvolve_SOURCES = main.c main.h args.h ui.c ui.h
convolve.c \
convolve.h cite.h
astconvolve_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalcheckset -lgalfits -lgaltiming -lgalconfigfiles -lgalmesh \
--lgalthreads -lgalspatialconvolve -lgalbox -lgalarraymanip -lgalstatistics \
--lgalqsort -lgallinkedlist
-
+-lgnuastro
diff --git a/src/cosmiccal/Makefile.am b/src/cosmiccal/Makefile.am
index 3f0e51c..8e49b10 100644
--- a/src/cosmiccal/Makefile.am
+++ b/src/cosmiccal/Makefile.am
@@ -29,8 +29,7 @@ astcosmiccal_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
cosmiccal.c cosmiccal.h
astcosmiccal_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la
\
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist
-
+-lgnuastro
diff --git a/src/header/Makefile.am b/src/header/Makefile.am
index ba27129..59a1415 100644
--- a/src/header/Makefile.am
+++ b/src/header/Makefile.am
@@ -29,8 +29,7 @@ astheader_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
header.c header.h
astheader_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist
-
+-lgnuastro
diff --git a/src/imgcrop/Makefile.am b/src/imgcrop/Makefile.am
index 136f102..e5d7202 100644
--- a/src/imgcrop/Makefile.am
+++ b/src/imgcrop/Makefile.am
@@ -29,9 +29,7 @@ astimgcrop_SOURCES = main.c main.h cite.h ui.c ui.h args.h
imgcrop.c \
imgcrop.h wcsmode.c wcsmode.h crop.c crop.h
astimgcrop_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalwcs -lgalfits -lgaltxtarray -lgalcheckset \
--lgallinkedlist -lgaltiming -lgalthreads -lgalbox -lgalpolygon
-
+-lgnuastro
diff --git a/src/imgstat/Makefile.am b/src/imgstat/Makefile.am
index cb6d747..6b0b094 100644
--- a/src/imgstat/Makefile.am
+++ b/src/imgstat/Makefile.am
@@ -29,9 +29,7 @@ astimgstat_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
imgstat.c imgstat.h
astimgstat_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist \
--lgalmode -lgalstatistics -lgalarraymanip -lgalqsort
-
+-lgnuastro
diff --git a/src/imgwarp/Makefile.am b/src/imgwarp/Makefile.am
index 96de79f..6b0ffdb 100644
--- a/src/imgwarp/Makefile.am
+++ b/src/imgwarp/Makefile.am
@@ -29,9 +29,7 @@ astimgwarp_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
imgwarp.c imgwarp.h
astimgwarp_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgaltxtarray -lgalcheckset -lgaltiming \
--lgalthreads -lgalpolygon
-
+-lgnuastro
diff --git a/src/mkcatalog/Makefile.am b/src/mkcatalog/Makefile.am
index 2077c3c..771961a 100644
--- a/src/mkcatalog/Makefile.am
+++ b/src/mkcatalog/Makefile.am
@@ -29,9 +29,7 @@ astmkcatalog_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
mkcatalog.c mkcatalog.h columns.c columns.h
astmkcatalog_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalstatistics -lgalarraymanip -lgalqsort -lgalfits \
--lgalwcs -lgalcheckset -lgaltiming -lgallinkedlist -lgaltxtarray
-
+-lgnuastro
diff --git a/src/mknoise/Makefile.am b/src/mknoise/Makefile.am
index 8158e1e..1f46728 100644
--- a/src/mknoise/Makefile.am
+++ b/src/mknoise/Makefile.am
@@ -29,8 +29,7 @@ astmknoise_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
mknoise.c mknoise.h
astmknoise_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgalthreads
-
+-lgnuastro
diff --git a/src/mkprof/Makefile.am b/src/mkprof/Makefile.am
index a40d592..c238b82 100644
--- a/src/mkprof/Makefile.am
+++ b/src/mkprof/Makefile.am
@@ -29,9 +29,7 @@ astmkprof_SOURCES = main.c main.h ui.c ui.h mkprof.c mkprof.h
args.h \
oneprofile.c oneprofile.h profiles.c profiles.h cite.h
astmkprof_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalwcs -lgaltxtarray -lgalcheckset \
--lgallinkedlist -lgaltiming -lgalthreads -lgalbox -lgalstatistics \
--lgalarraymanip -lgalqsort
+-lgnuastro
diff --git a/src/noisechisel/Makefile.am b/src/noisechisel/Makefile.am
index 211f6c4..64dbbe4 100644
--- a/src/noisechisel/Makefile.am
+++ b/src/noisechisel/Makefile.am
@@ -31,9 +31,7 @@ label.c label.h detection.c detection.h sky.c sky.h
segmentation.c \
segmentation.h clumps.c clumps.h
astnoisechisel_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgalmesh \
--lgalspatialconvolve -lgalthreads -lgalmode -lgalstatistics \
--lgalarraymanip -lgalqsort -lgallinkedlist -lgalbox
+-lgnuastro
diff --git a/src/subtractsky/Makefile.am b/src/subtractsky/Makefile.am
index 94c7f36..a00635b 100644
--- a/src/subtractsky/Makefile.am
+++ b/src/subtractsky/Makefile.am
@@ -29,9 +29,7 @@ astsubtractsky_SOURCES = main.c main.h cite.h ui.c ui.h
args.h \
subtractsky.c subtractsky.h
astsubtractsky_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgalmesh \
--lgalspatialconvolve -lgalthreads -lgalmode -lgalstatistics \
--lgalarraymanip -lgalqsort -lgallinkedlist -lgalbox
+-lgnuastro
diff --git a/src/table/Makefile.am b/src/table/Makefile.am
index 4c66f48..fb72dc0 100644
--- a/src/table/Makefile.am
+++ b/src/table/Makefile.am
@@ -29,8 +29,7 @@ asttable_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
table.c table.h
asttable_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgalcheckset -lgaltiming -lgallinkedlist \
--lgaltxtarray
+-lgnuastro
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnuastro-commits] master 547eb4f: Static and shared libraries are now installed,
Mohammad Akhlaghi <=