Changeset 1547

Timestamp:

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

Author:

rblod

Message:

Add external directory to be able to compiler IO_SERVER with or without fcm, see ticket #497

Location:

trunk

Files:

• EXTERNAL (added)
• EXTERNAL/MISC (added)
• EXTERNAL/MISC/README (added)
• EXTERNAL/README (added)
• EXTERNAL/XMLF90 (added)
• EXTERNAL/XMLF90/AA_make (added)
• EXTERNAL/XMLF90/AA_make.ldef (added)
• EXTERNAL/XMLIO_SERVER (added)
• EXTERNAL/XMLIO_SERVER/AA_make (added)
• EXTERNAL/XMLIO_SERVER/AA_make.ldef (added)
• UTIL/fait_AA_make (modified) (4 diffs)

trunk/UTIL/fait_AA_make

@@ -35 +35 @@
 if [ "$stringtest" ]; then
    echo 'aliasing echo with /bin/echo -e ...'
-   alias echo='/bin/echo -e'
+   alias echo='echo -e'
 fi
 
@@ -66 +66 @@
       @if [ ! -d ../../../lib/oce ] ; then mkdir ../../../lib/oce ; fi
 
-\$(EXEC_BIN) : libioipsl libioserver firstagrif mpiagrif key keyverif src_file_list libagrif \$(MODEL_LIB) \$(IOIPSL_LIB) \$(AGRIF_LIB) agrif2model.o model.o
+\$(EXEC_BIN) : libioipsl libioserver firstagrif mpiagrif key keyverif src_file_list libagrif \$(MODEL_LIB) \$(IOIPSL_LIB) \$(AGRIF_LIB) agrif2model.o model.o 
 ifeq (\$(AGRIF),use)
       \$(F_L) \$(L_X) -o \$(EXEC_BIN) model.o agrif2model.o \$(SXMODEL_LIB) \$(USER_LIB) \$(IOIPSL_LIB) \$(AGRIF_LIB) \$(NCDF_LIB) \$(LIBMPI) \$(LIBMP)
@@ -76 +76 @@
 libioserver :
 ifeq (\$(IOSERVER),use)
+ifeq (\$(FCM),use)
    (cd ../../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 ../../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 ../../XMLF90 ; \$(M_K) -f Makefile )
+   (cd ../../XMLIO_SERVER ; \$(M_K) -f Makefile P_P="\$(IOSERVER_MPI)" )
+endif
 endif
 
@@ -298 +303 @@
 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 '# A variables related to xmlioserver compilationi (fcm or AA_make)'
+echo '# Please do not change '
+echo 'override FCM += notuse'
 
 echo ''