Changeset 1549 for trunk/NVTK

Timestamp:

2009-07-28T14:58:08+02:00 (15 years ago)

Author:

rblod

Message:

external: update NVTK, renaiming again and afain

File:

• trunk/NVTK/fait_AA_make (modified) (3 diffs)

trunk/NVTK/fait_AA_make

@@ -41 +41 @@
 if [ "$stringtest" ]; then
    echo 'aliasing echo with /bin/echo -e ...'
-   alias echo='/bin/echo -e'
+   alias echo='echo -e'
 fi
 
@@ -92 +92 @@
 libioserver :
 ifeq (\$(IOSERVER),use)
+ifeq (\$(FCM),use)
    (cd ../../../modeles/XMLF90; ./configure -arch \$(FCM_ARCH); fcm build; mkdir -p ../../lib/libxmlio_server  ; cd ../../lib/libxmlio_server ; ln -sf ../../modeles/XMLF90/lib/*.a .; ln -sf ../../modeles/XMLF90/inc/*.mod .)
    (cd ../../../modeles/XMLIO_SERVER; ./configure -arch \$(FCM_ARCH); fcm build ; cd ../../lib/libxmlio_server ; ln -sf ../../modeles/XMLIO_SERVER/lib/*.a . ; ln -sf ../../modeles/XMLIO_SERVER/inc/* . ; cd ../../bin ; ln -sf ../modeles/XMLIO_SERVER/bin/server.exe ioserver)
++else
+   (cd ../../../modeles/XMLF90/external ; \$(M_K) -f Makefile )
+   (cd ../../../modeles/XMLIO_SERVER/external ; \$(M_K) -f Makefile P_P="\$(IOSERVER_MPI)" )
+endif
 endif
 
@@ -324 +329 @@
 echo 'override USER_LIB += -L../../../lib/libxmlio_server -lioserver -lxmlio -lxmlf90'
 echo 'override USER_INC += -I../../../lib/libxmlio_server'
+echo 'ifneq (,$(findstring key_mpp_mpi,$(P_P)))'
+echo 'IOSERVER_MPI='
+echo 'else'
+echo 'IOSERVER_MPI=-DNO_MPI'
+echo 'endif'
 echo 'else'
 echo 'IOSERVER=notuse'
 echo 'endif'
-
-echo ''
+echo ''
+
+echo '# A variables related to xmlioserver compilationi (fcm or AA_make)'
+echo '# Please do not change '
+echo 'override FCM += notuse'
+
+ echo ''
 # Write the cpp key list with one key by line
 echo 'KEY_LIST = \c'