A bit of cleanup and prelude program is now specified through

arguments on command line.


git-svn-id: https://svn.onera.fr/Prelude/Prelude/trunk@894 49f62630-d767-4ccd-930e-b3f5589f52e1

share/ptask_wrapper.make

 # Authors: Titouan ROOS, Julien FORGET
 
-# Note: for correct execution privileges, run 'echo -1 > /proc/sys/kernel/sched_rt_runtime_us'
+# Note: for correct execution privileges, run:
+# sudo sh -c "echo -1 > /proc/sys/kernel/sched_rt_runtime_us"
+
 
 # modify these 2 folders depending on your installation
-PTASK_SOURCE_FOLDER=/home/forget/tmp/ptask
-PRELUDE_FOLDER=/home/forget/Code/Prelude/trunk
+PTASK_SOURCE_FOLDER=/home/forget/Installs/ptask
+PRELUDE_FOLDER=/home/forget/Installs/prelude-1.7
 
 PRELUDE_BIN_FOLDER=$(PRELUDE_FOLDER)/bin
 PRELUDE_SHARE_FOLDER=$(PRELUDE_FOLDER)/share
 PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib/prelude
 
-# modify these 3 lines for each new Prelude program
+# the following lines depend on the Prelude program you want to compile
 PRELUDE_PROGRAM_FOLDER=.
-PRELUDE_PROGRAM_NAME=fcs
-PRELUDE_NODE_NAME=fcs
+PRELUDE_PROGRAM_NAME=$(PROG)
+PRELUDE_NODE_NAME=$(NODE)
+# next line is used only if nodes are not directly defined in header file
+# USER_C_NODES=$(USER_C_FOLDER)/$(PRELUDE_PROGRAM_NAME)_nodes
+
 
 PTASK_WRAPPER=$(PRELUDE_SHARE_FOLDER)/ptask_wrapper
 
@@ -21,17 +26,15 @@ PRELUDE_PROGRAM=$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME).plu
 PRELUDE_C_PROGRAM=$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME)_c/$(PRELUDE_NODE_NAME)
 
 USER_C_FOLDER=$(PRELUDE_PROGRAM_FOLDER)
-# next line is used only if nodes are not directly defined in header file
-USER_C_NODES=$(USER_C_FOLDER)/$(PRELUDE_PROGRAM_NAME)_nodes
 
-OBJS=$(PTASK_WRAPPER).o $(PRELUDE_C_PROGRAM).o $(USER_C_NODES).o
+OBJS=$(PTASK_WRAPPER).o $(PRELUDE_C_PROGRAM).o #$(USER_C_NODES).o
 
 PRELUDEC=$(PRELUDE_BIN_FOLDER)/preludec
 PLUFLAGS=-with_encoding
 
 CC=gcc
 CFLAGS=-I$(PTASK_SOURCE_FOLDER)/src -I$(USER_C_FOLDER) -I$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME)_c -I$(PRELUDE_LIB_FOLDER) -Wall
-LDFLAGS=-lptask -L$(PTASK_SOURCE_FOLDER)/build/src -pthread
+LDFLAGS=-L$(PTASK_SOURCE_FOLDER)/build/src -lptask -pthread -lrt
 EXEC=$(PRELUDE_PROGRAM_NAME)
 
 all: executable

share/ptask_wrapper_aer.make

 # Authors: Titouan ROOS, Julien FORGET, Frédéric Fort
 .SUFFIX: 
 
-# modify these folders depending on your installation
-PTASK_SOURCE_FOLDER=/usr/local
-PRELUDE_FOLDER=/usr/local
+# Note: for correct execution privileges, run:
+# sudo sh -c "echo -1 > /proc/sys/kernel/sched_rt_runtime_us"
+
+# modify these 2 folders depending on your installation
+PTASK_SOURCE_FOLDER=/home/forget/Installs/ptask
+PRELUDE_FOLDER=/home/forget/Installs/prelude-1.7
+
 PRELUDE_BIN_FOLDER=$(PRELUDE_FOLDER)/bin
 PRELUDE_SHARE_FOLDER=$(PRELUDE_FOLDER)/share
 PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib/prelude
 
-# modify these 3 lines for each new Prelude program
+# the following lines depend on the Prelude program you want to compile
 PRELUDE_PROGRAM_FOLDER=.
-PRELUDE_PROGRAM_NAME=fcs
-PRELUDE_NODE_NAME=fcs
+PRELUDE_PROGRAM_NAME=$(PROG)
+PRELUDE_NODE_NAME=$(NODE)
+# next line is used only if nodes are not directly defined in header file
+#USER_C_NODES=$(PRELUDE_PROGRAM_NAME)_nodes
 
 # you might want to copy the file out of your installation and modify this line
 PTASK_WRAPPER=$(PRELUDE_SHARE_FOLDER)/ptask_wrapper_aer
@@ -19,14 +25,13 @@ PTASK_WRAPPER=$(PRELUDE_SHARE_FOLDER)/ptask_wrapper_aer
 PRELUDE_PROGRAM=$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME).plu
 PRELUDE_C_FOLDER=$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME)_c
 PRELUDE_C_PROGRAM=$(PRELUDE_C_FOLDER)/$(PRELUDE_NODE_NAME)
-
-USER_C_FOLDER=$(PRELUDE_PROGRAM_FOLDER)
-# next line is used only if nodes are not directly defined in header file
-USER_C_NODES=$(PRELUDE_PROGRAM_NAME)_nodes
 EXTERN_BUFFERS=$(PRELUDE_C_FOLDER)/$(PRELUDE_NODE_NAME)_extbuffers
 EXTERN_COM=$(PRELUDE_LIB_FOLDER)/extern_com
 
-OBJS=$(PRELUDE_C_PROGRAM).o $(EXTERN_BUFFERS).o $(PTASK_WRAPPER).o $(USER_C_NODES).o $(EXTERN_COM).o
+USER_C_FOLDER=$(PRELUDE_PROGRAM_FOLDER)
+
+
+OBJS=$(PRELUDE_C_PROGRAM).o $(EXTERN_BUFFERS).o $(PTASK_WRAPPER).o $(EXTERN_COM).o #$(USER_C_NODES).o
 
 PRELUDEC=$(PRELUDE_BIN_FOLDER)/preludec
 PLUFLAGS=-aer