Summary: Misc.

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

share/ptask_wrapper.make

@@ -8,7 +8,7 @@ PRELUDE_FOLDER=/home/forget/Code/Prelude/trunk
 
 PRELUDE_BIN_FOLDER=$(PRELUDE_FOLDER)/bin
 PRELUDE_SHARE_FOLDER=$(PRELUDE_FOLDER)/share
-PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib
+PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib/prelude
 
 # modify these 3 lines for each new Prelude program
 PRELUDE_PROGRAM_FOLDER=.
@@ -30,7 +30,7 @@ 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)/prelude -Wall
+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
 EXEC=$(PRELUDE_PROGRAM_NAME)
 

share/ptask_wrapper_aer.make

@@ -6,7 +6,7 @@ PTASK_SOURCE_FOLDER=/usr/local
 PRELUDE_FOLDER=/usr/local
 PRELUDE_BIN_FOLDER=$(PRELUDE_FOLDER)/bin
 PRELUDE_SHARE_FOLDER=$(PRELUDE_FOLDER)/share
-PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib
+PRELUDE_LIB_FOLDER=$(PRELUDE_FOLDER)/lib/prelude
 
 # modify these 3 lines for each new Prelude program
 PRELUDE_PROGRAM_FOLDER=.
@@ -24,7 +24,7 @@ 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=extern_com
+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
 
@@ -32,7 +32,7 @@ PRELUDEC=$(PRELUDE_BIN_FOLDER)/preludec
 PLUFLAGS=-aer
 
 CC=gcc
-CFLAGS=-I$(PTASK_SOURCE_FOLDER)/src -I$(USER_C_FOLDER) -I$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME)_c -I$(PRELUDE_LIB_FOLDER)/prelude -Wall -g
+CFLAGS=-I$(PTASK_SOURCE_FOLDER)/src -I$(USER_C_FOLDER) -I$(PRELUDE_PROGRAM_FOLDER)/$(PRELUDE_PROGRAM_NAME)_c -I$(PRELUDE_LIB_FOLDER) -Wall -g
 LDFLAGS=-lptask -L$(PTASK_SOURCE_FOLDER)/build/src -pthread -lrt
 EXEC=$(PRELUDE_PROGRAM_NAME)