summaryrefslogtreecommitdiff
path: root/bin/MakeProjectCreator
diff options
context:
space:
mode:
Diffstat (limited to 'bin/MakeProjectCreator')
-rw-r--r--bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb8
-rw-r--r--bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb9
-rw-r--r--bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb7
-rw-r--r--bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb8
-rw-r--r--bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb8
-rw-r--r--bin/MakeProjectCreator/templates/gnu.mpd4
6 files changed, 33 insertions, 11 deletions
diff --git a/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb b/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb
new file mode 100644
index 00000000000..d082eb93f04
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_targetmanager_stub {
+ includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager
+ libs += NodeApplicationManager
+ after += NodeApplicationManager
+}
diff --git a/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb b/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb
new file mode 100644
index 00000000000..3208af9bd00
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_deployment_stub {
+ includes += $(CIAO_ROOT)/DAnCE/Interfaces
+ includes += $(CIAO_ROOT)/DAnCE/NodeManager
+ libs += NodeManager_stub
+ after += NodeManager_stub
+}
diff --git a/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb b/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
new file mode 100644
index 00000000000..4856402b74b
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_nodemanager_stub {
+ libs += NodeManager
+ after += NodeManager_svnt
+}
diff --git a/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb b/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb
index 5f2e5afd09f..62c745db095 100644
--- a/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb
+++ b/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb
@@ -1,12 +1,6 @@
// -*- MPC -*-
// $Id$
-project : ciao_component_dnc, iortable {
+project : ciao_nodemanager_svnt, ciao_nodeapplicationmanager, ciao_component_dnc, iortable {
- includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager
- includes += $(CIAO_ROOT)/DAnCE/NodeManager
- includes += $(CIAO_ROOT)/DAnCE/Interfaces
-
- libs += NodeManager NodeManager_stub NodeApplicationManager TargetManager_stub
- after += NodeManager NodeManager_stub NodeApplicationManager TargetManager_stub
}
diff --git a/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb b/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb
new file mode 100644
index 00000000000..107f41f94a7
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id
+
+project : ciao_nodemanager_stub {
+ includes += $(CIAO_ROOT)/DAnCE/TargetManager
+ libs += TargetManager_stub
+ after += CIAO_TargetManager_stub
+}
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 7ea302ffee0..ad2d0d0c444 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -621,11 +621,7 @@ endif
<%endif%>
$(BIN): $(addprefix $(VDIR), $(OBJS)) $(DEPLIBS)
-ifndef kylix
$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
-else
- $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,,
-endif
endif
<%endif%>