Give directory parallel/ddd/ctrl its own proper Makefile

configure.ac

@@ -246,6 +246,7 @@ AC_CONFIG_FILES([Makefile
 		 parallel/ddd/Makefile
 		 parallel/ddd/basic/Makefile
 		 parallel/ddd/basic/test/Makefile
+                 parallel/ddd/ctrl/Makefile
                  parallel/ddd/if/Makefile
                  parallel/ddd/mgr/Makefile
                  parallel/ddd/xfer/Makefile

parallel/ddd/Makefile.am

 # $Id$
 
-SUBDIRS = basic if mgr xfer
+SUBDIRS = basic ctrl if mgr xfer
 
 if PARALLEL
 
@@ -23,14 +23,10 @@ endif
 noinst_LTLIBRARIES = $(LIB_2D) $(LIB_3D)
 
 # set options from Makefile.dddobj
-
-# The first one is only used in ctrl
-DDDFLAGS = -DConsMemFromHeap -DDDD_FRONTEND_C
+DDDFLAGS = -DDDD_FRONTEND_C
 
 # reproduce the style of Makefile.ddd
 
-CTRL = ctrl/debug.c ctrl/cons.c ctrl/stat.c
-
 IDENT = ident/ident.c
 
 PRIO = prio/pcmds.c
@@ -45,16 +41,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 ctrl/stat.h \
+             include/fddd.f include/dddresources.h join/join.h \
              xif/if.h dddstr.h
 
-libddd2_la_SOURCES = $(CTRL) $(IDENT) \
-                    $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
+libddd2_la_SOURCES = $(IDENT) $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
 libddd2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
-libddd2_la_LIBADD = basic/libbasic2.la if/libif2.la mgr/libmgr2.la xfer/libxfer2.la
+libddd2_la_LIBADD = basic/libbasic2.la ctrl/libctrl2.la if/libif2.la mgr/libmgr2.la xfer/libxfer2.la
 
-libddd3_la_SOURCES = $(CTRL) $(IDENT) \
-                    $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
+libddd3_la_SOURCES = $(IDENT) $(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
 libddd3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
-libddd3_la_LIBADD = basic/libbasic3.la if/libif3.la mgr/libmgr3.la xfer/libxfer3.la
+libddd3_la_LIBADD = basic/libbasic3.la ctrl/libctrl3.la if/libif3.la mgr/libmgr3.la xfer/libxfer3.la
 

parallel/ddd/ctrl/Makefile.am

+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+  PLIB = libctrl2.la libctrl3.la
+else
+  PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS = stat.h
+
+SOURCES = cons.c debug.c stat.c
+
+libctrl2_la_SOURCES = $(SOURCES)
+libctrl2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS) -DConsMemFromHeap
+
+libctrl3_la_SOURCES = $(SOURCES)
+libctrl3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS) -DConsMemFromHeap