Give directory parallel/ddd/join its own proper Makefile

configure.ac

@@ -249,6 +249,7 @@ AC_CONFIG_FILES([Makefile
                  parallel/ddd/ctrl/Makefile
                  parallel/ddd/ident/Makefile
                  parallel/ddd/if/Makefile
+                 parallel/ddd/join/Makefile
                  parallel/ddd/mgr/Makefile
                  parallel/ddd/xfer/Makefile
 		 parallel/dddif/Makefile

parallel/ddd/Makefile.am

 # $Id$
 
-SUBDIRS = basic ctrl ident if mgr xfer
+SUBDIRS = basic ctrl ident if join mgr xfer
 
 if PARALLEL
 
@@ -29,8 +29,6 @@ DDDFLAGS = -DDDD_FRONTEND_C
 
 PRIO = prio/pcmds.c
 
-JOIN = join/join.c join/jcmds.c
-
 MISC = analyser/inv.c
 
 DDD = ddd.c dddi.h
@@ -39,14 +37,14 @@ DDD = ddd.c dddi.h
 pkginclude_HEADERS = include/ddd.h
 
 EXTRA_DIST = include/dddaddon.h include/ddd.h include/memmgr.h include/dddio.h \
-             include/fddd.f include/dddresources.h join/join.h \
+             include/fddd.f include/dddresources.h \
              xif/if.h dddstr.h
 
-libddd2_la_SOURCES = $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
+libddd2_la_SOURCES = $(PRIO) $(MISC) $(DDD) f77/f2c.c
 libddd2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
-libddd2_la_LIBADD = basic/libbasic2.la ctrl/libctrl2.la ident/libident2.la if/libif2.la mgr/libmgr2.la xfer/libxfer2.la
+libddd2_la_LIBADD = basic/libbasic2.la ctrl/libctrl2.la ident/libident2.la if/libif2.la join/libjoin2.la mgr/libmgr2.la xfer/libxfer2.la
 
-libddd3_la_SOURCES = $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
+libddd3_la_SOURCES = $(PRIO) $(MISC) $(DDD) f77/f2c.c
 libddd3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
-libddd3_la_LIBADD = basic/libbasic3.la ctrl/libctrl3.la ident/libident3.la if/libif3.la mgr/libmgr3.la xfer/libxfer3.la
+libddd3_la_LIBADD = basic/libbasic3.la ctrl/libctrl3.la ident/libident3.la if/libif3.la join/libjoin3.la mgr/libmgr3.la xfer/libxfer3.la
 

parallel/ddd/join/Makefile.am

+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+  PLIB = libjoin2.la libjoin3.la
+else
+  PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS = join.h
+
+SOURCES = jcmds.c join.c
+
+libjoin2_la_SOURCES = $(SOURCES)
+libjoin2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libjoin3_la_SOURCES = $(SOURCES)
+libjoin3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)