From 0cbfffe5ffbea9f8e0f309c9247751b44947d5ea Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 19 Feb 2014 14:59:34 +0100
Subject: [PATCH] Give proper Makefiles to dirs
parallel/ddd/{analyser|f77|prio}
---
configure.ac | 3 +++
parallel/ddd/Makefile.am | 17 +++++------------
parallel/ddd/analyser/Makefile.am | 21 +++++++++++++++++++++
parallel/ddd/f77/Makefile.am | 21 +++++++++++++++++++++
parallel/ddd/prio/Makefile.am | 21 +++++++++++++++++++++
5 files changed, 71 insertions(+), 12 deletions(-)
create mode 100644 parallel/ddd/analyser/Makefile.am
create mode 100644 parallel/ddd/f77/Makefile.am
create mode 100644 parallel/ddd/prio/Makefile.am
diff --git a/configure.ac b/configure.ac
index 96450262d..8b5a64bf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,13 +244,16 @@ AC_CONFIG_FILES([Makefile
parallel/ppif/Makefile
parallel/ppif/MPI/Makefile
parallel/ddd/Makefile
+ parallel/ddd/analyser/Makefile
parallel/ddd/basic/Makefile
parallel/ddd/basic/test/Makefile
parallel/ddd/ctrl/Makefile
+ parallel/ddd/f77/Makefile
parallel/ddd/ident/Makefile
parallel/ddd/if/Makefile
parallel/ddd/join/Makefile
parallel/ddd/mgr/Makefile
+ parallel/ddd/prio/Makefile
parallel/ddd/xfer/Makefile
parallel/dddif/Makefile
libug.pc
diff --git a/parallel/ddd/Makefile.am b/parallel/ddd/Makefile.am
index 806442e33..846532e8d 100644
--- a/parallel/ddd/Makefile.am
+++ b/parallel/ddd/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-SUBDIRS = basic ctrl ident if join mgr xfer
+SUBDIRS = analyser basic ctrl f77 ident if join mgr prio xfer
if PARALLEL
@@ -22,15 +22,8 @@ endif
noinst_LTLIBRARIES = $(LIB_2D) $(LIB_3D)
-# set options from Makefile.dddobj
DDDFLAGS = -DDDD_FRONTEND_C
-# reproduce the style of Makefile.ddd
-
-PRIO = prio/pcmds.c
-
-MISC = analyser/inv.c
-
DDD = ddd.c dddi.h
# header files that are not explicitly used but need to be distributed
@@ -40,11 +33,11 @@ EXTRA_DIST = include/dddaddon.h include/ddd.h include/memmgr.h include/dddio.h \
include/fddd.f include/dddresources.h \
xif/if.h dddstr.h
-libddd2_la_SOURCES = $(PRIO) $(MISC) $(DDD) f77/f2c.c
+libddd2_la_SOURCES = $(DDD)
libddd2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
-libddd2_la_LIBADD = basic/libbasic2.la ctrl/libctrl2.la ident/libident2.la if/libif2.la join/libjoin2.la mgr/libmgr2.la xfer/libxfer2.la
+libddd2_la_LIBADD = analyser/libanalyser2.la basic/libbasic2.la ctrl/libctrl2.la f77/libf772.la ident/libident2.la if/libif2.la join/libjoin2.la mgr/libmgr2.la prio/libprio2.la xfer/libxfer2.la
-libddd3_la_SOURCES = $(PRIO) $(MISC) $(DDD) f77/f2c.c
+libddd3_la_SOURCES = $(DDD)
libddd3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
-libddd3_la_LIBADD = basic/libbasic3.la ctrl/libctrl3.la ident/libident3.la if/libif3.la join/libjoin3.la mgr/libmgr3.la xfer/libxfer3.la
+libddd3_la_LIBADD = analyser/libanalyser3.la basic/libbasic3.la ctrl/libctrl3.la f77/libf773.la ident/libident3.la if/libif3.la join/libjoin3.la mgr/libmgr3.la prio/libprio3.la xfer/libxfer3.la
diff --git a/parallel/ddd/analyser/Makefile.am b/parallel/ddd/analyser/Makefile.am
new file mode 100644
index 000000000..dccd9ca9b
--- /dev/null
+++ b/parallel/ddd/analyser/Makefile.am
@@ -0,0 +1,21 @@
+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+ PLIB = libanalyser2.la libanalyser3.la
+else
+ PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS =
+
+SOURCES = inv.c
+
+libanalyser2_la_SOURCES = $(SOURCES)
+libanalyser2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libanalyser3_la_SOURCES = $(SOURCES)
+libanalyser3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
diff --git a/parallel/ddd/f77/Makefile.am b/parallel/ddd/f77/Makefile.am
new file mode 100644
index 000000000..ac316fcb9
--- /dev/null
+++ b/parallel/ddd/f77/Makefile.am
@@ -0,0 +1,21 @@
+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+ PLIB = libf772.la libf773.la
+else
+ PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS =
+
+SOURCES = f2c.c
+
+libf772_la_SOURCES = $(SOURCES)
+libf772_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libf773_la_SOURCES = $(SOURCES)
+libf773_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
diff --git a/parallel/ddd/prio/Makefile.am b/parallel/ddd/prio/Makefile.am
new file mode 100644
index 000000000..2bcd45fd3
--- /dev/null
+++ b/parallel/ddd/prio/Makefile.am
@@ -0,0 +1,21 @@
+# $Id$
+
+SUBDIRS =
+
+if PARALLEL
+ PLIB = libprio2.la libprio3.la
+else
+ PLIB =
+endif
+
+noinst_LTLIBRARIES = $(PLIB)
+
+pkginclude_HEADERS =
+
+SOURCES = pcmds.c
+
+libprio2_la_SOURCES = $(SOURCES)
+libprio2_la_CPPFLAGS = $(UG_2DFLAGS) $(DDDFLAGS)
+
+libprio3_la_SOURCES = $(SOURCES)
+libprio3_la_CPPFLAGS = $(UG_3DFLAGS) $(DDDFLAGS)
--
GitLab