Changing makefile to make sure that all the dynanmic components are built

This commit was SVN r4171.

src/mca/allocator/basic/allocator_basic.c

@@ -76,7 +76,8 @@ mca_allocator_base_module_t* mca_allocator_basic_component_init(
     mca_allocator_base_component_segment_alloc_fn_t segment_alloc,
     mca_allocator_base_component_segment_free_fn_t segment_free)
 {
-    mca_allocator_basic_module_t* module = malloc(sizeof(mca_allocator_basic_module_t));
+    mca_allocator_basic_module_t *module = (mca_allocator_basic_module_t *)
+                                            malloc(sizeof(mca_allocator_basic_module_t));
     if(module == NULL)
         return NULL;
 
@@ -190,8 +191,8 @@ void *mca_allocator_basic_alloc(
     }
 
     /* request additional block */
-    allocated_size = size;
-    if(NULL == (addr = module->seg_alloc(&allocated_size))) {
+    allocated_size = (unsigned char)size;
+    if(NULL == (addr = (unsigned char *)module->seg_alloc(&allocated_size))) {
         OMPI_THREAD_UNLOCK(&module->seg_lock);
         return NULL;
     }
@@ -240,7 +241,7 @@ void * mca_allocator_basic_realloc(
     size_t alloc_size = *(size_t*)addr;
     if(size <= alloc_size)
         return ptr;
-    addr = mca_allocator_basic_alloc(base,size,0);
+    addr = (unsigned char *)mca_allocator_basic_alloc(base,size,0);
     if(addr == NULL)
         return addr;
     memcpy(addr,ptr,alloc_size);

src/mca/ptl/self/ptl_self.c

@@ -172,8 +172,8 @@ void mca_ptl_self_matched( mca_ptl_base_module_t* ptl,
             ompi_ddt_copy_content_same_ddt( recvreq->req_base.req_datatype, 
                                             recvreq->req_base.req_count > sendreq->req_send.req_count ?
                                             sendreq->req_send.req_count : recvreq->req_base.req_count,
-                                            recvreq->req_base.req_addr, 
-                                            sendreq->req_send.req_addr );
+                                            (char *)recvreq->req_base.req_addr, 
+                                            (const char *)sendreq->req_send.req_addr );
         } else {
             ompi_convertor_t *pSendConvertor, *pRecvConvertor;
             struct iovec iov[1];
@@ -183,7 +183,7 @@ void mca_ptl_self_matched( mca_ptl_base_module_t* ptl,
             
             /* We use a temporary buffer as it look to be faster on much architectures */
             length = 64 * 1024;
-            buf = malloc( length * sizeof(char) );
+            buf = (char *)malloc( length * sizeof(char) );
             
             ompi_convertor_init_for_recv( &frag->frag_base.frag_convertor, 
                                           0, 

src/mca/ptl/self/ptl_self_component.c

@@ -160,7 +160,8 @@ mca_ptl_base_module_t** mca_ptl_self_component_init(int *num_ptl_modules,
     *allow_multi_user_threads = true;
     *have_hidden_threads = false;
 
-    mca_ptl_self_component.self_ptl_modules = malloc(sizeof(mca_ptl_base_module_t*));
+    mca_ptl_self_component.self_ptl_modules = (mca_ptl_base_module_t **)
+                                                malloc(sizeof(mca_ptl_base_module_t*));
     if( NULL == mca_ptl_self_component.self_ptl_modules )
         return NULL;
     mca_ptl_self_component.self_ptl_modules[0] = &mca_ptl_self_module;

src/mca/win_makefile

@@ -22,7 +22,7 @@ topdir := $(shell cygpath -m $(CURDIR))/../..
 gen_base = ${topdir}/src/win32/generated_include
 copy_base = ${topdir}/src/mca/
 prefix = ${topdir}/Debug
-installdir = ${prefix}
+installdir = ${prefix}/lib
 
 # list of components to build with the c compiler
 C_SUBDIRS = \
@@ -38,6 +38,8 @@ C_SUBDIRS = \
 # list of components to build with the cpp compiler
 # (because of the problem with OBJ_CLASS_INSTANCE)
 CPP_SUBDIRS = \
+        allocator/basic \
+        ptl/self \
         ptl/tcp/src \
         oob/tcp/ \
         pml/teg/src \
@@ -105,6 +107,8 @@ LINK = link
 
 LINKFLAGS = \
         /DLL \
+        /OPT:NOICF \
+        /OPT:NOREF \
         /DEFAULTLIB:${OMPILIB} \
         /nologo
 
@@ -151,13 +155,13 @@ install:
 	@echo -n "Installing components ......................."
 	@for dirs in ${CPP_SUBDIRS}; do \
 	    (dll=`echo mca_$${dirs}.dll | sed 's/\/src//g' | sed 's/\//_/g'`; exp=`echo $${dll} | sed 's/dll/exp/g`;  lib=`echo $${dll} | sed 's/dll/lib/g`; \
-        install -c ${CURDIR}/$${dirs}/$${dll} ${install_dir}/$${dll}; \
+        install -p ${CURDIR}/$${dirs}/$${dll} ${install_dir}/$${dll}; \
         if test -f ${CURDIR}/$${dirs}/$${lib}; then install -c ${CURDIR}/$${dirs}/$${lib} ${install_dir}/$${lib}; fi; \
         if test -f ${CURDIR}/$${dirs}/$${exp}; then install -c ${CURDIR}/$${dirs}/$${exp} ${install_dir}/$${exp}; fi;); \
 	done
 	@for dirs in ${C_SUBDIRS}; do \
 	    (dll=`echo mca_$${dirs}.dll | sed 's/\/src//g' | sed 's/\//_/g'`; exp=`echo $${dll} | sed 's/dll/exp/g`;  lib=`echo $${dll} | sed 's/dll/lib/g`; \
-        install -c ${CURDIR}/$${dirs}/$${dll} ${install_dir}/$${dll}; \
+        install -p ${CURDIR}/$${dirs}/$${dll} ${install_dir}/$${dll}; \
         if test -f ${CURDIR}/$${dirs}/$${lib}; then install -c ${CURDIR}/$${dirs}/$${lib} ${install_dir}/$${lib}; fi; \
         if test -f ${CURDIR}/$${dirs}/$${exp}; then install -c ${CURDIR}/$${dirs}/$${exp} ${install_dir}/$${exp}; fi;); \
 	done