Changeset 213

Timestamp:

06/10/11 16:03:58 (14 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (6 diffs)
• src/xmlio/config/context_attribute.conf (modified) (1 diff)
• xmlioserver.geany (deleted)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -16 +16 @@
 GUI       = no
 NPROC     = 6
+VERSION   =
 CSUITE    = intel
 PFORME    = fedora-wk
@@ -172 +173 @@
 ############################# Répertoire du projet #############################
 
-OBJ_PATH  = $(DEV_PATH)/wk/obj
-BIN_PATH  = $(DEV_PATH)/wk/bin
-LIB_PATH  = $(DEV_PATH)/wk/lib
-SRC_PATH  = $(DEV_PATH)/src/xmlio
-DOC_PATH  = $(DEV_PATH)/wk/doc
-DEP_PATH  = $(DEV_PATH)/wk/dep
-INC_PATH  = $(DEV_PATH)/wk/inc
-DATA_PATH = $(DEV_PATH)/wk/data
-CONF_PATH = $(DEV_PATH)/wk/conf
-DEF_PATH  = $(DEV_PATH)/wk/def
+WK_PATH   = $(DEV_PATH)/wk
+
+OBJ_PATH  = $(WK_PATH)/obj
+BIN_PATH  = $(WK_PATH)/bin
+LIB_PATH  = $(WK_PATH)/lib
+DOC_PATH  = $(WK_PATH)/doc
+DEP_PATH  = $(WK_PATH)/dep
+INC_PATH  = $(WK_PATH)/inc
+DATA_PATH = $(WK_PATH)/data
+CONF_PATH = $(WK_PATH)/conf
+DEF_PATH  = $(WK_PATH)/def
+
+SRC_PATH  = $(DEV_PATH)/src$(VERSION)/xmlio
 
 # Sous-répertoires des sources :
@@ -255 +259 @@
 FFLAGS      += -I $(MPI_INCL)
 
-
 ifeq ($(PFORME), fedora-wk)
         LIBS        += -lmpi_cxx
@@ -275 +278 @@
 
 FFLAGS  += -D XIOS_LIBRARY
-CFLAGS   = $(DEFINE) $(INCLUDE)
-LDFLAGS  = $(LIBS_PATH) $(LIBS)
+CFLAGS  += $(DEFINE) $(INCLUDE)
+LDFLAGS += $(LIBS_PATH) $(LIBS)
 
 ifeq ($(CSUITE), intel)
@@ -422 +425 @@
 #$(REMOVE) $(COM_T2T)
 
+.PHONY: clean-dir
+clean-dir:
+        $(RMDIR) $(WK_PATH)
+
 clean-h:
         $(REMOVE) $(INC_PATH)/*.hpp
@@ -461 +468 @@
         clean-h      \
         clean-depend
-
 
 .PHONY: clean-all

XMLIO_V2/dev/dev_rv/src/xmlio/config/context_attribute.conf

@@ -1 +1 @@
 DECLARE_ATTRIBUTE(StdString, calendar_type)
 DECLARE_ATTRIBUTE(StdString, start_date)
+
+   DECLARE_ATTRIBUTE(StdString, output_dir)