From e6a6c10e9ec51a6465cc7006aa3df2e73aa5f2a1 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 19 Feb 2014 14:45:57 +0100
Subject: [PATCH] Give directory parallel/ddd/join its own proper Makefile
---
configure.ac | 1 +
parallel/ddd/Makefile.am | 14 ++++++--------
parallel/ddd/join/Makefile.am | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
create mode 100644 parallel/ddd/join/Makefile.am
diff --git a/configure.ac b/configure.ac
index 4429aae12..96450262d 100644
--- a/configure.ac
+++ b/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
diff --git a/parallel/ddd/Makefile.am b/parallel/ddd/Makefile.am
index 0a061d35e..806442e33 100644
--- a/parallel/ddd/Makefile.am
+++ b/parallel/ddd/Makefile.am
@@ -1,6 +1,6 @@
# $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
diff --git a/parallel/ddd/join/Makefile.am b/parallel/ddd/join/Makefile.am
new file mode 100644
index 000000000..5fe745b2b
--- /dev/null
+++ b/parallel/ddd/join/Makefile.am
@@ -0,0 +1,21 @@
+# $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)
--
GitLab