Changeset 157 for XMLIO_V2/dev/dev_rv/Makefile.wk

Timestamp:

03/25/11 11:42:58 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/Makefile.wk (modified) (19 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -21 +21 @@
 DEV_PATH  = $(PWD)
 
+ifeq ($(HOSTNAME), lsce4063.extra.cea.fr)
+        PFORME     = fedora-wk
+endif
 
 ifeq ($(HOST), mercure01)
@@ -36 +39 @@
         NETCDF_PATH = /applications/netcdf-4.1.1
         INTEL_PATH  = 
-        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.33
+        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.44
+        RXML_PATH   = $(DEV_PATH)/extra/rapidxml-1.13
         HDF5_PATH   = /applications/hdf5-1.8.5
         MPI_PATH    = /opt/mpi/mpibull2-1.3.9-18.s
+
         DEFINE     += -D MPIBULL_SKIP_MPICXX 
 endif
 
 ifeq ($(PFORME), sx8-mercure-wk)
-        NETCDF_PATH = /ccc/applications/sx8/netcdf-3.6.1
-        INTEL_PATH  =
-        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.33
-        HDF5_PATH   = 
-        MPI_PATH    = /applications/mpisx-8.0.10
+        NETCDF_PATH = /ccc/applications/sx8/netcdf-3.6.1
+        INTEL_PATH  =
+        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.33
+        RXML_PATH   = $(DEV_PATH)/extra/rapidxml-1.13
+        HDF5_PATH   = 
+        MPI_PATH    = /applications/mpisx-8.0.10
 endif
 
@@ -53 +59 @@
         NETCDF_PATH = $(DEV_PATH)/netcdf4
         INTEL_PATH  = /work/intel/composerxe
-        BOOST_PATH  = /usr/include
+        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.44
+        RXML_PATH   = $(DEV_PATH)/extra/rapidxml-1.13
         HDF5_PATH   = $(DEV_PATH)/hdf5
         MPI_PATH    = /usr/lib/openmpi
@@ -65 +72 @@
 
 ifeq ($(COMPTOOL), sx-sx8-mercure-wk)
-        CDEP   = $(A)g++
+        CDEP   = $(A)g++
         CCPP   = $(A)sxc++
-        CFORT  = $(A)sxf90
-        LINK   = $(A)sxmpif90 -nofor-main
-        AR     = $(A)sxar
-        T2F    = # indisponible
-        RMDIR  = $(A)rm -rf
-        REMOVE = $(A)rm -f
-        COPY   = $(A)cp
-        DOX    = # indisponible
-        TAR    = # indisponible
-        GZIP   = # indisponible
-        EXNET  = # indisponible
-        MPIRUN = $(A)$(MPI_PATH)/bin/mpirun
+        CFORT  = $(A)sxf90
+        LINK   = $(A)sxmpif90 -nofor-main
+        AR     = $(A)sxar
+        T2F    = # indisponible
+        RMDIR  = $(A)rm -rf
+        REMOVE = $(A)rm -f
+        COPY   = $(A)cp
+        DOX    = # indisponible
+        TAR    = # indisponible
+        GZIP   = # indisponible
+        EXNET  = # indisponible
+        MPIRUN = $(A)$(MPI_PATH)/bin/mpirun
 endif
 
@@ -167 +174 @@
 DOC_PATH  = $(DEV_PATH)/doc
 DEP_PATH  = $(DEV_PATH)/dep
+INC_PATH  = $(DEV_PATH)/include
 DATA_PATH = $(DEV_PATH)/data
 CONF_PATH = $(DEV_PATH)/conf
@@ -176 +184 @@
 CSRC_PATH = $(SRC_PATH)/iface
 
+CONF_PATH = $(SRC_PATH)/config
 NODE_PATH = $(SRC_PATH)/node
 FUNC_PATH = $(SRC_PATH)/functor
@@ -191 +200 @@
 VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH)\
 :$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH)\
-:$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH)
+:$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH)
 
 ######################## Outils de traitements internes ########################
@@ -201 +210 @@
 
 INCLUDE    = -I $(BOOST_PATH)
+
+####################### Chemins vers la bibliothÚque RAPIDXML ##################
+
+INCLUDE   += -I $(RXML_PATH)
 
 ####################### Chemins vers la bibliothÚque VTK #######################
@@ -219 +232 @@
 HDF5_LIB    = $(HDF5_PATH)/lib
 
-
 ifeq ($(PFORME), sx8-mercure-wk)
         HDF5_INCL   =
@@ -246 +258 @@
 
 ifeq ($(PFORME), fedora-wk)
-        LIBS        += -lmpi_cxx
+        LIBS        += -lmpi_cxx
 endif
 
 ################################ VARIABLES #####################################
 
-INCLUDE += -I $(SRC_PATH)
+INCLUDE += -I $(INC_PATH)
 DEFINE  += -D XIOS_LIBRARY
 
@@ -331 +343 @@
 OSOURCE = onetcdf4 nc4_data_output
 
-# Source des faux client
+# Source des faux clients
 TSOURCE = fake_nemo fake_lmdz fake_orchidee
 
@@ -341 +353 @@
 
 ##############################  Modifications ##################################
+
+AHEADERS  =  \
+$(notdir $(wildcard $(SRC_PATH)/*/*.conf))\
+$(notdir $(wildcard $(SRC_PATH)/*/*.hpp))\
+$(notdir $(wildcard $(SRC_PATH)/*.hpp))
+            
+HEADERS   = $(addprefix $(INC_PATH)/, $(AHEADERS))
 
 ELEMS_FOR = $(TSOURCE) $(IFSOURCE) 
@@ -354 +373 @@
 
 ################################### RÚgles #####################################
-
 all: depend build
 
@@ -368 +386 @@
 
 .PHONY: depend
-depend: preproc $(DEPENDS)
+depend: preproc $(DEPENDS) cheaders
+
+.PHONY: cheaders
+cheaders: $(HEADERS)
 
 .PHONY: preproc
@@ -376 +397 @@
 clean-depend:
         $(REMOVE) $(DEP_PATH)/*.d
+        $(REMOVE) $(DEP_PATH)/mark
 
 clean-t2t:
 #$(REMOVE) $(COM_T2T)
 
+clean-h:
+        $(REMOVE) $(INC_PATH)/*.hpp
+        $(REMOVE) $(INC_PATH)/*.conf
+        
 clean-doc: clean-t2t
         $(RMDIR)  $(DOC_PATH)/html
@@ -412 +438 @@
         clean-mod    \
         clean-gen    \
+        clean-h      \
         clean-depend
 
@@ -441 +468 @@
         $(call COLORMSG, $(C_Purple),"Génération du serveur d'E/S de l'IPSL ($(VERSTR) C++) ...")
         $(LINK) -o $@ $^ $(LDFLAGS)
-        
+
 $(LIBSTATIC) : $(OBJECTS)
         $(call COLORMSG, $(C_Green),"Génération de l'archive de la bibliothÚque d'E/S de l'IPSL...")
@@ -467 +494 @@
 
 # Dépendances
-$(DEP_PATH)/%.d: %.cpp
+$(DEP_PATH)/mark: $(HEADERS)
+        @touch $@
+
+$(DEP_PATH)/%.d: %.cpp $(DEP_PATH)/mark
         $(CDEP) $(CFLAGS) -D XIOS_NO_EXTERN -MT $(OBJ_PATH)/$(patsubst %.d,%.o,$(@F)) -MM -MF $@ $<
+
+# Entêtes cpp
+$(INC_PATH)/%.hpp: %.hpp
+        $(COPY) $< $@
+
+$(INC_PATH)/%.conf: %.conf
+        $(COPY) $< $@
 
 # Objets cpp
@@ -475 +512 @@
 
 # Objets fortran
-
 $(FSRC_PATH)/%.f03: %.f90
         $(COPY) $< $@