From b1bff87e3801deaec50845f92cf2695c09b377e8 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 18 Feb 2014 21:37:38 +0100
Subject: [PATCH] Give the directory parallel/ddd/if its own proper Makefile
---
configure.ac | 1 +
parallel/ddd/Makefile.am | 15 ++++++---------
parallel/ddd/if/Makefile.am | 23 +++++++++++++++++++++++
3 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 parallel/ddd/if/Makefile.am
diff --git a/configure.ac b/configure.ac
index 22add43aa..2b5907010 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,7 @@ AC_CONFIG_FILES([Makefile
parallel/ddd/Makefile
parallel/ddd/basic/Makefile
parallel/ddd/basic/test/Makefile
+ parallel/ddd/if/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 3496e529c..e148490ba 100644
--- a/parallel/ddd/Makefile.am
+++ b/parallel/ddd/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-SUBDIRS = basic mgr xfer
+SUBDIRS = basic if mgr xfer
if PARALLEL
@@ -33,8 +33,6 @@ CTRL = ctrl/debug.c ctrl/cons.c ctrl/stat.c
IDENT = ident/ident.c
-IF = if/ifcreate.c if/ifuse.c if/ifcmds.c if/ifcheck.c if/ifobjsc.c
-
PRIO = prio/pcmds.c
JOIN = join/join.c join/jcmds.c
@@ -48,16 +46,15 @@ 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 \
- xif/if.h if/ifstd.ct if/ifcmd.ct \
- dddstr.h
+ xif/if.h dddstr.h
-libddd2_la_SOURCES = $(CTRL) $(IDENT) $(IF) $(XFER) \
+libddd2_la_SOURCES = $(CTRL) $(IDENT) $(XFER) \
$(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
libddd2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
-libddd2_la_LIBADD = basic/libbasic2.la mgr/libmgr2.la xfer/libxfer2.la
+libddd2_la_LIBADD = basic/libbasic2.la if/libif2.la mgr/libmgr2.la xfer/libxfer2.la
-libddd3_la_SOURCES = $(CTRL) $(IDENT) $(IF) $(XFER) \
+libddd3_la_SOURCES = $(CTRL) $(IDENT) $(XFER) \
$(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
libddd3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
-libddd3_la_LIBADD = basic/libbasic3.la mgr/libmgr3.la xfer/libxfer3.la
+libddd3_la_LIBADD = basic/libbasic3.la if/libif3.la mgr/libmgr3.la xfer/libxfer3.la
diff --git a/parallel/ddd/if/Makefile.am b/parallel/ddd/if/Makefile.am
new file mode 100644
index 000000000..8fd14b6ed
--- /dev/null
+++ b/parallel/ddd/if/Makefile.am
@@ -0,0 +1,23 @@
+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+ PLIB = libif2.la libif3.la
+else
+ PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS = if.h
+
+EXTRA_DIST = ifstd.ct ifcmd.ct
+
+SOURCES = ifcreate.c ifuse.c ifcmds.c ifcheck.c ifobjsc.c
+
+libif2_la_SOURCES = $(SOURCES)
+libif2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libif3_la_SOURCES = $(SOURCES)
+libif3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
--
GitLab