Another attempt at correct linking for both linux and darwin.

tskisner · Jul 3, 2017 · e486d7f · e486d7f
1 parent 9bf0dc7
commit e486d7f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/apps-mpi/Makefile.am b/src/apps-mpi/Makefile.am
@@ -19,8 +19,12 @@ BUILT_SOURCES =
 CLEANFILES =
 
 harp_mpi_extract_SOURCES = harp_mpi_extract.cpp
-harp_mpi_extract_LDADD = $(top_builddir)/src/libharp-mpi/libharp-mpi.la
+harp_mpi_extract_LDADD = \
+	$(top_builddir)/src/libharp-mpi/libharp-mpi.la \
+	$(AM_LIBS)
 
 harp_mpi_desi_SOURCES = harp_mpi_desi.cpp
-harp_mpi_desi_LDADD = $(top_builddir)/src/libharp-mpi/libharp-mpi.la
+harp_mpi_desi_LDADD = \
+	$(top_builddir)/src/libharp-mpi/libharp-mpi.la \
+	$(AM_LIBS)
 
diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
@@ -19,13 +19,19 @@ CLEANFILES =
 bin_PROGRAMS = harp_example_imgstack harp_extract harp_validate
 
 harp_example_imgstack_SOURCES = harp_example_imgstack.cpp
-harp_example_imgstack_LDADD = $(top_builddir)/src/libharp/libharp.la
+harp_example_imgstack_LDADD = \
+	$(top_builddir)/src/libharp/libharp.la \
+	$(AM_LIBS)
 
 harp_extract_SOURCES = harp_extract.cpp
-harp_extract_LDADD = $(top_builddir)/src/libharp/libharp.la
+harp_extract_LDADD = \
+	$(top_builddir)/src/libharp/libharp.la \
+	$(AM_LIBS)
 
 harp_validate_SOURCES = harp_validate.cpp
-harp_validate_LDADD = $(top_builddir)/src/libharp/libharp.la
+harp_validate_LDADD = \
+	$(top_builddir)/src/libharp/libharp.la \
+	$(AM_LIBS)
 
 
 if HAVE_AM_PYTHON

diff --git a/src/tests-mpi/Makefile.am b/src/tests-mpi/Makefile.am
@@ -23,7 +23,9 @@ harp_mpi_test_SOURCES = \
 	harp_mpi_test_spec.cpp \
 	harp_mpi_test_extract.cpp
 
-harp_mpi_test_LDADD = $(top_builddir)/src/libharp-mpi/libharp-mpi.la
+harp_mpi_test_LDADD = \
+	$(top_builddir)/src/libharp-mpi/libharp-mpi.la
+	$(AM_LIBS)
 
 
 MAINTAINERCLEANFILES =

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
@@ -30,7 +30,9 @@ harp_test_SOURCES = \
 	harp_test_specslice.cpp \
 	harp_test_extract.cpp
 
-harp_test_LDADD = $(top_builddir)/src/libharp/libharp.la
+harp_test_LDADD = \
+	$(top_builddir)/src/libharp/libharp.la \
+	$(AM_LIBS)
 
 # Manual dependency on the data directory