Make shared libraries work: don't link one convenience library into another

library of program multiple times.

[[Imported from SVN: r8363]]

dom/std/Makefile.am

@@ -2,23 +2,14 @@
 
 SOURCES = std_domain.c std_parallel.c std_domain.h std_internal.h
 
-EXTRALIBS = ../../low/liblow.la ../../dev/libdevices.la
-EXTRALIBS2D = ../../low/liblow2.la
-EXTRALIBS3D = ../../low/liblow3.la
 if BUILD2D
   LIB_2D = libdomS2.la
-if PARALLEL
-  PLIBS2 = ../../gm/libug_gm2.la ../../parallel/libparallel2.la
-endif
 else
   LIB_2D =
 endif
 
 if BUILD3D
   LIB_3D = libdomS3.la
-if PARALLEL
-  PLIBS3 = ../../gm/libug_gm3.la ../../parallel/libparallel3.la
-endif
 else
   LIB_3D =
 endif
@@ -29,8 +20,6 @@ include_HEADERS = std_domain.h
 
 libdomS2_la_SOURCES = $(SOURCES) domains2d.c
 libdomS2_la_CPPFLAGS = $(UG_2DFLAGS)
-libdomS2_la_LIBADD = $(PLIBS2) $(EXTRALIBS) $(EXTRALIBS2D)
 
 libdomS3_la_SOURCES = $(SOURCES) domains3d.c
 libdomS3_la_CPPFLAGS = $(UG_3DFLAGS)
-libdomS3_la_LIBADD = $(PLIBS3) $(EXTRALIBS) $(EXTRALIBS3D)

gm/Makefile.am

@@ -12,21 +12,14 @@ include_HEADERS = gm.h pargm.h evm.h shapes.h dlmgr.h algebra.h \
 
 
 
-EXTRALIBS =
 if BUILD2D
   LIB_2D = libug_gm2.la
-if PARALLEL
-  EXTRALIBS += ../parallel/dddif/libdddif2.la
-endif
 else
   LIB_2D =
 endif
 
 if BUILD3D
   LIB_3D = libug_gm3.la
-if PARALLEL
-  EXTRALIBS += ../parallel/dddif/libdddif3.la
-endif
 else
   LIB_3D =
 endif
@@ -36,8 +29,8 @@ noinst_LTLIBRARIES = $(LIB_2D) $(LIB_3D)
 
 libug_gm2_la_SOURCES = $(SOURCES)
 libug_gm2_la_CPPFLAGS = $(UG_2DFLAGS)
-libug_gm2_la_LIBADD = gg2/libgg2.la ../low/liblow2.la
+libug_gm2_la_LIBADD = gg2/libgg2.la
 
 libug_gm3_la_SOURCES = $(SOURCES)
 libug_gm3_la_CPPFLAGS = $(UG_3DFLAGS)
-libug_gm3_la_LIBADD = gg3/libgg3.la ../low/liblow3.la
+libug_gm3_la_LIBADD = gg3/libgg3.la

lib/Makefile.am

@@ -33,6 +33,9 @@ lib_LTLIBRARIES = $(LIB_2D) $(LIB_3D)
 libugS2_la_SOURCES = ../initug.c
 libugS2_la_CPPFLAGS = $(UG_2DFLAGS)
 libugS2_la_LIBADD = $(2DLIBS) ../dom/std/libdomS2.la
+if PARALLEL
+  libugS2_la_LIBADD += ../parallel/libparallel2.la
+endif
 
 libugL2_la_SOURCES = ../initug.c
 libugL2_la_CPPFLAGS = $(UG_2DFLAGS)
@@ -41,6 +44,9 @@ libugL2_la_LIBADD = $(2DLIBS) ../dom/lgm/libdomL2.la
 libugS3_la_SOURCES = ../initug.c
 libugS3_la_CPPFLAGS = $(UG_3DFLAGS)
 libugS3_la_LIBADD = $(3DLIBS) ../dom/std/libdomS3.la
+if PARALLEL
+  libugS3_la_LIBADD += ../parallel/libparallel3.la
+endif
 
 libugL3_la_SOURCES = ../initug.c
 libugL3_la_CPPFLAGS = $(UG_3DFLAGS)

low/Makefile.am

@@ -24,20 +24,12 @@ include_HEADERS = heaps.h ugenv.h ugstruct.h misc.h debug.h ugtypes.h \
 # special library for the parts of low that need a dimension
 DIMDEPSOURCES = boxtree.c pfile.c
 
-if PARALLEL
-  PLIBS_2D = ../parallel/libparallel2.la
-  PLIBS_3D = ../parallel/libparallel3.la
-else
-  PLIBS_2D =
-  PLIBS_3D =
-endif
-
 liblow2_la_SOURCES = $(DIMDEPSOURCES)
 liblow2_la_CPPFLAGS = $(UG_2DFLAGS)
 liblow2_la_LIBADD = ../parallel/util/libparutil.la \
-                   $(PLIBS_2D) liblow.la
+                   liblow.la
 
 liblow3_la_SOURCES = $(DIMDEPSOURCES)
 liblow3_la_CPPFLAGS = $(UG_3DFLAGS)
 liblow3_la_LIBADD = ../parallel/util/libparutil.la \
-                   $(PLIBS_3D) liblow.la
+                   liblow.la

np/Makefile.am

@@ -28,8 +28,7 @@ libnp2_la_LIBADD = algebra/libalgebra2.la \
                    amglib/libamg2.la \
                    field/libfield2.la \
                    procs/libprocs2.la \
-                   udm/libudm2.la \
-                   ../low/liblow2.la
+                   udm/libudm2.la
 
 libnp3_la_SOURCES = $(SOURCES)
 libnp3_la_CPPFLAGS = $(UG_3DFLAGS)
@@ -37,6 +36,5 @@ libnp3_la_LIBADD = algebra/libalgebra3.la \
                    amglib/libamg3.la \
                    field/libfield3.la \
                    procs/libprocs3.la \
-                   udm/libudm3.la \
-                   ../low/liblow3.la
+                   udm/libudm3.la
 

parallel/Makefile.am

@@ -16,12 +16,12 @@ noinst_LTLIBRARIES = $(PLIB)
 
 SOURCES = initparallel.c initparallel.h
 
-SUBLIBS = ddd/libddd2.la ddd/libddd3.la ppif/MPI/libppifmpi.la
+SUBLIBS = ppif/MPI/libppifmpi.la
 
 libparallel2_la_SOURCES = $(SOURCES)
 libparallel2_la_CPPFLAGS = $(UG_2DFLAGS)
-libparallel2_la_LIBADD = $(SUBLIBS) dddif/libdddif2.la
+libparallel2_la_LIBADD = $(SUBLIBS) ddd/libddd2.la dddif/libdddif2.la
 
 libparallel3_la_SOURCES = $(SOURCES)
 libparallel3_la_CPPFLAGS = $(UG_3DFLAGS)
-libparallel3_la_LIBADD = $(SUBLIBS) dddif/libdddif3.la
+libparallel3_la_LIBADD = $(SUBLIBS) ddd/libddd3.la dddif/libdddif3.la