From 8a709df0dc34dd5e28f8f76c8c300351f655a67e Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 18 Feb 2014 21:08:02 +0100
Subject: [PATCH] Give the directory parallel/ddd/mgr its own proper Makefile
This silences a few warnings I get from recent AutoTools
---
configure.ac | 1 +
parallel/ddd/Makefile.am | 14 ++++++--------
parallel/ddd/mgr/Makefile.am | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
create mode 100644 parallel/ddd/mgr/Makefile.am
diff --git a/configure.ac b/configure.ac
index 051ff8fd6..824d4680a 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/mgr/Makefile
parallel/dddif/Makefile
libug.pc
ug-config.cmake
diff --git a/parallel/ddd/Makefile.am b/parallel/ddd/Makefile.am
index 8292bc332..aa6f1a270 100644
--- a/parallel/ddd/Makefile.am
+++ b/parallel/ddd/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-SUBDIRS = basic
+SUBDIRS = basic mgr
if PARALLEL
@@ -31,8 +31,6 @@ DDDFLAGS = -DXferMemFromHeap -DConsMemFromHeap -DDDD_FRONTEND_C
CTRL = ctrl/debug.c ctrl/cons.c ctrl/stat.c
-MGR = mgr/typemgr.c mgr/objmgr.c mgr/cplmgr.c mgr/prio.c mgr/attr.c
-
IDENT = ident/ident.c
IF = if/ifcreate.c if/ifuse.c if/ifcmds.c if/ifcheck.c if/ifobjsc.c
@@ -54,15 +52,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 \
xfer/xfer.h xfer/sll.ct xfer/sll.h xfer/sll.ht if/if.h if/ifstd.ct if/ifcmd.ct \
- dddstr.h mgr/handler.ct
+ dddstr.h
-libddd2_la_SOURCES = $(CTRL) $(MGR) $(IDENT) $(IF) $(XFER) \
+libddd2_la_SOURCES = $(CTRL) $(IDENT) $(IF) $(XFER) \
$(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
libddd2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
-libddd2_la_LIBADD = basic/libbasic2.la
+libddd2_la_LIBADD = basic/libbasic2.la mgr/libmgr2.la
-libddd3_la_SOURCES = $(CTRL) $(MGR) $(IDENT) $(IF) $(XFER) \
+libddd3_la_SOURCES = $(CTRL) $(IDENT) $(IF) $(XFER) \
$(PRIO) $(JOIN) $(MISC) $(DDD) f77/f2c.c
libddd3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
-libddd3_la_LIBADD = basic/libbasic3.la
+libddd3_la_LIBADD = basic/libbasic3.la mgr/libmgr3.la
diff --git a/parallel/ddd/mgr/Makefile.am b/parallel/ddd/mgr/Makefile.am
new file mode 100644
index 000000000..149ba9ca6
--- /dev/null
+++ b/parallel/ddd/mgr/Makefile.am
@@ -0,0 +1,21 @@
+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+ PLIB = libmgr2.la libmgr3.la
+else
+ PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+EXTRA_DIST = handler.ct
+
+SOURCES = typemgr.c objmgr.c cplmgr.c prio.c attr.c
+
+libmgr2_la_SOURCES = $(SOURCES)
+libmgr2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libmgr3_la_SOURCES = $(SOURCES)
+libmgr3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
--
GitLab