making some minor changes which will make it compile on windows

This commit was SVN r4135.

src/datatype/ddt_test.c

@@ -16,7 +16,7 @@
 #include "ompi_config.h"
 #include <stdbool.h>
 #include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype_internal.h"
 #include <time.h>
 #include <stdlib.h>
 #ifdef HAVE_SYS_TIME_H

src/datatype/dt_add.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 /* When we add a datatype we should update it's definition depending on
  * the initial displacement for the whole data, so the displacement of

src/datatype/dt_create.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 #include "limits.h"
 #include "attribute/attribute.h"
 

src/datatype/dt_create_array.c

@@ -14,7 +14,7 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
+#include "datatype/datatype.h"
 
 int ompi_ddt_create_subarray( int ndims, const int* pSizes, const int* pSubSizes, const int* pStarts,
                              int order, const dt_desc_t* oldType, dt_desc_t** newType )

src/datatype/dt_create_dup.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 int ompi_ddt_duplicate( const dt_desc_t* oldType, dt_desc_t** newType )
 {

src/datatype/dt_create_indexed.c

@@ -14,7 +14,7 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
+#include "datatype/datatype.h"
 
 /* We try to merge together data that are contiguous */
 int ompi_ddt_create_indexed( int count, const int* pBlockLength, const int* pDisp,

src/datatype/dt_create_struct.c

@@ -14,7 +14,7 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
+#include "datatype/datatype.h"
 
 int ompi_ddt_create_struct( int count, const int* pBlockLength, const long* pDisp,
                             const dt_desc_t ** pTypes, dt_desc_t** newType )

src/datatype/dt_create_vector.c

@@ -14,7 +14,7 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
+#include "datatype/datatype.h"
 
 /* Open questions ...
  *  - how to improuve the handling of these vectors (creating a temporary datatype

src/datatype/dt_destroy.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 int ompi_ddt_destroy( dt_desc_t** dt )
 {

src/datatype/dt_module.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 /* by default the debuging is turned off */
 int ompi_ddt_dfd = -1;

src/datatype/dt_optimize.c

@@ -15,8 +15,8 @@
 
 #include "ompi_config.h"
 
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif

src/datatype/dt_pack.c

@@ -15,8 +15,8 @@
 
 #include "ompi_config.h"
 
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>

src/datatype/dt_unpack.c

@@ -14,8 +14,8 @@
  */
 
 #include "ompi_config.h"
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>

src/datatype/fake_stack.c

@@ -15,8 +15,8 @@
 
 #include "ompi_config.h"
 
-#include "datatype.h"
-#include "datatype_internal.h"
+#include "datatype/datatype.h"
+#include "datatype/datatype_internal.h"
 
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>

src/mca/iof/base/iof_base_endpoint.c

@@ -11,12 +11,14 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/oob/base/base.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 /**
  *  Construct/Destructor

src/mca/iof/base/iof_base_flush.c

@@ -11,12 +11,14 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_NETINET_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/oob/base/base.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 /**
  * timer callback out of the event loop

src/mca/iof/base/iof_base_fragment.c

@@ -11,12 +11,14 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #include "util/output.h"
 #include "mca/oob/base/base.h"
 #include "mca/iof/base/base.h"
-#include "iof_base_endpoint.h"
-#include "iof_base_fragment.h"
+#include "mca/iof/base/iof_base_endpoint.h"
+#include "mca/iof/base/iof_base_fragment.h"
 
 
 /**

src/mca/pcm/base/pcm_base_data_store.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "base_data_store.h"
+#include "mca/pcm/base/base_data_store.h"
 
 #include "mca/ns/ns.h"
 #include "mca/ns/base/base.h"

src/mca/pcm/base/pcm_base_kill_track.c

@@ -17,7 +17,7 @@
 
 #include <errno.h>
 
-#include "base_kill_track.h"
+#include "mca/pcm/base/base_kill_track.h"
 #include "include/constants.h"
 #include "mca/gpr/base/base.h"
 #include "mca/gpr/gpr.h"

src/mca/pml/base/pml_base_bsend.c

@@ -21,7 +21,7 @@
 #include "mca/pml/pml.h"
 #include "mca/pml/base/pml_base_request.h"
 #include "mca/pml/base/pml_base_sendreq.h"
-#include "pml_base_bsend.h"
+#include "mca/pml/base/pml_base_bsend.h"
  
 static ompi_mutex_t     mca_pml_bsend_mutex;      /* lock for thread safety */
 static ompi_condition_t mca_pml_bsend_condition;  /* condition variable to block on detach */

src/mca/ptl/base/ptl_base_comm.c

@@ -14,7 +14,7 @@
 
 #include "ompi_config.h"
 #include <string.h>
-#include "ptl_base_comm.h"
+#include "mca/ptl/base/ptl_base_comm.h"
 
 static void mca_pml_ptl_comm_construct(mca_pml_ptl_comm_t* comm);
 static void mca_pml_ptl_comm_destruct(mca_pml_ptl_comm_t* comm);

src/mca/win_makefile

@@ -18,9 +18,11 @@
 # this to the svn repository
 #
 
+topdir := $(shell cygpath -m $(CURDIR))/../..
 gen_base = ${topdir}/src/win32/generated_include
 copy_base = ${topdir}/src/mca/
-install_dir = ${prefix}
+prefix = ${topdir}/Debug
+installdir = ${prefix}
 
 # list of components to build with the c compiler
 C_SUBDIRS = \
@@ -44,31 +46,58 @@ CPP_SUBDIRS = \
         gpr/replica/
 
 #list of components that are not working as yet
-CPP_EXCLUDE = \
-        ptl/tcp/src \
-        pcm/wmi
+CPP_EXCLUDE = pcm/wmi
 
 CC = cl
 
 INCL = \
         /I"${topdir}/src/win32/generated_include" \
-        /I"${topdir}/src/win32/" \
+        /I"${topdir}/src/win32" \
+        /I"${topdir}/include" \
         /I"${topdir}/src" \
-        /I"${topdir}/include"
+        /I"${topdir}/src/event/compat/" \
+        /I"${topdir}/src/event" \
+        /I"${topdir}/src/event/WIN32-Code/" 
 
 CFLAGS = \
         /DWIN32 \
-        /DOMPI_SYSCONFDIR="\"${install-dir}/share\"" \
+        /DOMPI_BUILDING=0 \
+        /DHAVE_CONFIG_H \
+        /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
+        /D_WINDLL \
+        /EHsc \
+        /MLd \
+        /W0 \
+        /Wp64 \
+        /ZI \
+        /Zi \
+        /TC \
+        /D_MBCS \
+        /Gm \
+        /Od \
+        /LDd \
         /nologo \
-        /c 
+        /c
 
 CPPFLAGS = \
         /DWIN32 \
-        /DOMPI_SYSCONFDIR="\"${install-dir}/share\"" \
-        /c \
         /TP \
+        /DOMPI_BUILDING=0 \
+        /DHAVE_CONFIG_H \
+        /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
+        /D_WINDLL \
+        /EHsc \
+        /MLd \
+        /W0 \
+        /Wp64 \
+        /ZI \
+        /Zi \
+        /D_MBCS \
+        /Gm \
+        /Od \
+        /LDd \
         /nologo \
-        /EHsc
+        /c
 
 # link with ompi.lib to resolve external symbols
 OMPILIB = \

src/mpi/runtime/ompi_mpi_io.c

@@ -22,6 +22,8 @@ int ompi_mpi_init_io(void)
     int fds[2];
     int rc;
 
+#ifndef WIN32
+    /* We need to add a NULL component for iof. Until then, this will have to do */
     /* setup stdin */
     rc = pipe(fds);
     if(rc < 0) {
@@ -69,6 +71,7 @@ int ompi_mpi_init_io(void)
         fds[0]);
     if(rc != OMPI_SUCCESS)
         return rc;
+#endif
     return OMPI_SUCCESS;
 }
 

src/runtime/ompi_rte_finalize.c

@@ -48,7 +48,10 @@ int ompi_rte_finalize(void)
 #endif
   ompi_rte_internal_fini_spawn();
 
+#ifndef WIN32
+  /* We need to add a NULL component for iof. Until then, this will have to do */
   mca_iof_base_close();
+#endif
   mca_pcm_base_close();
   mca_llm_base_close();
   mca_pcmclient_base_close();

src/runtime/ompi_rte_init.c

@@ -204,10 +204,11 @@ int ompi_rte_init(ompi_cmd_line_t *cmd_line, bool *allow_multi_user_threads, boo
 	return ret;
     }
 
-#if 1
+#ifndef WIN32
     /*
      * Open I/O forwarding components.
      */
+    /* We need to add a NULL component for iof. Until then, this will have to do */
     if (OMPI_SUCCESS != (ret = mca_iof_base_open())) {
 	/* JMS show_help */
 	printf("show_help: ompi_rte_init failed in mca_iof_base_open\n");
@@ -417,11 +418,14 @@ int ompi_rte_init(ompi_cmd_line_t *cmd_line, bool *allow_multi_user_threads, boo
     }
 
     /* setup I/O forwarding */
+#ifndef WIN32
+    /* We need to add a NULL component for iof. Until then, this will have to do */
     if (OMPI_SUCCESS != (ret = mca_iof_base_select(&user_threads, &hidden_threads))) {
 	/* JMS show_help */
 	printf("show_help: ompi_rte_init failed in mca_iof_base_select()\n");
 	return ret;
     }
+#endif
     *allow_multi_user_threads &= user_threads;
     *have_hidden_threads |= hidden_threads;
 

src/threads/condition_pthread.c

@@ -14,8 +14,8 @@
 
 #include "ompi_config.h"
 
-#include "mutex.h"
-#include "condition.h"
+#include "threads/mutex.h"
+#include "threads/condition.h"
 
 #if OMPI_HAVE_POSIX_THREADS
 

src/threads/condition_spinlock.c

@@ -14,8 +14,8 @@
 
 #include "ompi_config.h"
 
-#include "mutex.h"
-#include "condition.h"
+#include "threads/mutex.h"
+#include "threads/condition.h"
 
 #if (OMPI_HAVE_THREADS == 0)
 

src/util/bufpack.c

@@ -39,7 +39,7 @@
 #include "class/ompi_object.h"
 #include "mca/ns/ns.h"
 
-#include "bufpack.h"
+#include "util/bufpack.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

src/win32/generated_include/allocator_static-components.h

@@ -12,11 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_allocator_bucket_component;
-extern const mca_base_component_t mca_allocator_basic_component;
-
 const mca_base_component_t *mca_allocator_base_static_components[] = {
-  &mca_allocator_bucket_component, 
-  &mca_allocator_basic_component, 
   NULL
 };

src/win32/generated_include/coll_static-components.h

@@ -12,9 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_coll_basic_component;
-
 const mca_base_component_t *mca_coll_base_static_components[] = {
-  &mca_coll_basic_component, 
   NULL
 };

src/win32/generated_include/gpr_static-components.h

@@ -12,11 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_gpr_replica_component;
-extern const mca_base_component_t mca_gpr_proxy_component;
-
 const mca_base_component_t *mca_gpr_base_static_components[] = {
-  &mca_gpr_replica_component, 
-  &mca_gpr_proxy_component, 
   NULL
 };

src/win32/generated_include/iof_static-components.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+const mca_base_component_t *mca_iof_base_static_components[] = {
+  NULL
+};

src/win32/generated_include/llm_static-components.h

@@ -12,9 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_llm_hostfile_component;
-
 const mca_base_component_t *mca_llm_base_static_components[] = {
-  &mca_llm_hostfile_component, 
   NULL
 };

src/win32/generated_include/ns_static-components.h

@@ -12,11 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_ns_replica_component;
-extern const mca_base_component_t mca_ns_proxy_component;
-
 const mca_base_component_t *mca_ns_base_static_components[] = {
-  &mca_ns_replica_component, 
-  &mca_ns_proxy_component, 
   NULL
 };

src/win32/generated_include/oob_static-components.h

@@ -12,9 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_oob_tcp_component;
-
 const mca_base_component_t *mca_oob_base_static_components[] = {
-  &mca_oob_tcp_component, 
   NULL
 };

src/win32/generated_include/pcm_static-components.h

@@ -12,13 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_pcm_rsh_component;
-extern const mca_base_component_t mca_pcm_ompid_component;
-extern const mca_base_component_t mca_pcm_rms_component;
-
 const mca_base_component_t *mca_pcm_base_static_components[] = {
-  &mca_pcm_rsh_component, 
-  &mca_pcm_ompid_component, 
-  &mca_pcm_rms_component, 
   NULL
 };

src/win32/generated_include/pcmclient_static-components.h

@@ -12,13 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_pcmclient_singleton_component;
-extern const mca_base_component_t mca_pcmclient_seed_component;
-extern const mca_base_component_t mca_pcmclient_env_component;
-
 const mca_base_component_t *mca_pcmclient_base_static_components[] = {
-  &mca_pcmclient_singleton_component, 
-  &mca_pcmclient_seed_component, 
-  &mca_pcmclient_env_component, 
   NULL
 };

src/win32/generated_include/pml_static-components.h

@@ -12,9 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_pml_teg_component;
-
 const mca_base_component_t *mca_pml_base_static_components[] = {
-  &mca_pml_teg_component, 
   NULL
 };

src/win32/generated_include/ptl_static-components.h

@@ -12,11 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_ptl_tcp_component;
-extern const mca_base_component_t mca_ptl_self_component;
-
 const mca_base_component_t *mca_ptl_base_static_components[] = {
-  &mca_ptl_self_component, 
-  &mca_ptl_tcp_component, 
   NULL
 };

src/win32/generated_include/topo_static-components.h

@@ -12,9 +12,6 @@
  * $HEADER$
  */
 
-extern const mca_base_component_t mca_topo_unity_component;
-
 const mca_base_component_t *mca_topo_base_static_components[] = {
-  &mca_topo_unity_component, 
   NULL
 };

src/win_makefile

@@ -18,8 +18,9 @@
 # this to the svn repository
 #
 
-topdir = `echo $(CURDIR) | sed 's/^\//C:\/cygwin\//g' | sed 's/\/src//g'`
-install-dir = ${prefix}
+topdir := $(shell cygpath -m $(CURDIR))/..
+prefix = ${topdir}/src/Debug
+installdir = ${prefix}
 pkgdatadir = ${prefix}/share
 sysconfdir = ${prefix}/etc
 pkglibdir = ${prefix}/lib
@@ -49,6 +50,7 @@ C_SUBDIRS =  \
         mca/coll/base \
         mca/gpr/base \
         mca/io/base \
+        mca/iof/base \
         mca/llm/base \
         mca/mpool/base \
         mca/ns/base \
@@ -62,54 +64,31 @@ C_SUBDIRS =  \
         mca/topo/base \
         win32/generated_source \
         win \
-        win32 \
-        mca/allocator/bucket \
-        mca/coll/basic \
-        mca/llm/hostfile/src \
-        mca/ns/proxy/src \
-        mca/gpr/proxy/ \
-        mca/pcmclient/env \
-        mca/pcmclient/seed \
-        mca/pcmclient/singleton \
-        mca/topo/unity/src \
-        mca/ptl/tcp/src \
-        mca/oob/tcp/ \
-        mca/pml/teg/src \
-        mca/ns/replica/src \
-        mca/gpr/replica/
+        win32 
 
-EXTRA_DIRS = \
-
-
-STATIC_LIBS = \
-        allocator \
-        coll\
-        llm\
-        ns\
-        gpr \
-        pcmclient\
-        topo\
-        ptl\
-        oob\
-        pml\
-        ns\
-        gpr
+EXTRA_DIRS = 
 
 #
 # A small function to extract the list of all files in these directories
 #
-FILES = $(foreach dir, ${C_SUBDIRS}, $(wildcard ${dir}/*.[ch]))
+SOURCE_FILES = $(foreach dir, ${C_SUBDIRS}, $(wildcard ${dir}/*.[c]))
+OBJECT_FILES = $(SOURCE_FILES:.c=.obj)
+DEBUG = Debug
+LINKED_SOURCE = $(foreach dir, ${DEBUG}, $(wildcard ${dir}/*.[c]))
+LINKED_OBJS = $(LINKED_SOURCE:.c=.obj)
 
+.SUFFIXES: .c .obj
 CC = cl
+CXX = $(CC)
 
 INCL = \
-        /I"${topdir}/src/event/WIN32-Code/" \
-        /I"${topdir}/src/event/compat/" \
-        /I"${topdir}/src/win32/generated_include/libltdl" \
         /I"${topdir}/src/win32/generated_include" \
-        /I"${topdir}/src/win32/" \
+        /I"${topdir}/src/win32" \
+        /I"${topdir}/include" \
         /I"${topdir}/src" \
-        /I"${topdir}/include"
+        /I"${topdir}/src/event/compat/" \
+        /I"${topdir}/src/event" \
+        /I"${topdir}/src/event/WIN32-Code/" 
 
 CFLAGS = \
         /DWIN32 \
@@ -134,6 +113,23 @@ CFLAGS = \
         /nologo \
         /c
 
+STATIC_LIBS = \
+        allocator \
+        coll\
+        llm\
+        ns\
+        gpr \
+        pcmclient\
+        topo\
+        ptl\
+        oob\
+        pml\
+        ns\
+        gpr \
+        iof
+
+CXXFLAGS = $(CFLAGS) $(INCL)
+
 LINK = link
 
 LINKFLAGS = \
@@ -157,7 +153,10 @@ ADDLIBS = \
         odbc32.lib \
         odbccp32.lib 
 
-all: clibs libmpi
+.c.obj:
+	$(CXX) $(CXXFLAGS) $*.c
+
+all: libmpi
 
 prebuild:
 	@echo "Creating mca_base_parse_paramfile_lex.c"
@@ -169,33 +168,35 @@ prebuild:
 	@echo "Creating show_help_lex.c"
 	@/usr/bin/flex -t -Pompi_show_help_yy "${topdir}/src/util/show_help_lex.l" \
                 > "${topdir}/src/util/show_help_lex.c" 2>/dev/null
-	@echo -n "Copying static-components.h to the right directories ......"
 	@for dirs in ${STATIC_LIBS}; do \
         (dir="mca/$${dirs}/base"; comp_name="$${dirs}_static-components.h"; cp "${topdir}/src/win32/generated_include/$${comp_name}" "$${dir}/static-components.h";); \
      done
+	@for dirs in ${C_SUBDIRS}; do \
+	    (echo "Entering $${dirs}"; cd $$dirs; if test -f .compile_files; then (more .compile_files| xargs -i'{}' ln '{}' ${topdir}/src/Debug/'{}'); else (ls *.c 2>/dev/null | xargs -i'{}' ln '{}' ${topdir}/src/Debug/'{}'); fi); \
+	done
 	@echo "done"
 
 
-clibs: prebuild ${FILES}
-	@for dirs in ${C_SUBDIRS}; do \
-	    (echo "Entering $${dirs}"; cd $$dirs; if test -f .compile_files; then (more .compile_files| xargs -i'{}' ${CC} ${CFLAGS} ${INCL} '{}'); else (ls *.c 2>/dev/null | xargs -i'{}' ${CC} ${CFLAGS} ${INCL} '{}'); fi); \
-	done
-
-libmpi:
-	${LINK} ${LINKFLAGS} ${ADDLIBS} Debug/*.obj
+libmpi: $(LINKED_OBJS)
+	${LINK} ${LINKFLAGS} ${ADDLIBS} $(LINKED_OBJS)
 
 install:
 	@echo -n "Installing libmpi and include file ................"
-	@install -c ${topdir}/src/libmpi.lib ${install-dir}/lib/libmpi.lib
-	@install -c ${topdir}/src/libmpi.exp ${install-dir}/lib/libmpi.exp
-	@install -c ${topdir}/src/libmpi.dll ${install-dir}/lib/libmpi.dll
-	@install -c ${topdir}/include/ompi_config_bottom.h \
-                                    ${install-dir}/include/ompi_config_bottom.h 
-	@install -c ${topdir}/src/win32/generated_include/ompi_config.h \
-                                    ${install-dir}/include/ompi_config.h 
-	@install -c ${topdir}/include/mpi.h ${install-dir}/include/mpi.h
-	@install -c ${topdir}/include/ompi_stdint.h ${install-dir}/include/ompi_stdint.h
-	@install -c ${topdir}/src/win32/win_compat.h ${install-dir}/include/win32/win_compat.h
+	@install -d ${topdir}/src ${installdir}/lib
+	@install -p ${topdir}/src/libmpi.lib ${installdir}/lib/libmpi.lib
+	@install -p ${topdir}/src/libmpi.exp ${installdir}/lib/libmpi.exp
+	@install -p ${topdir}/src/libmpi.dll ${installdir}/lib/libmpi.dll
+	@install -p ${topdir}/src/vc70.idb ${installdir}/lib/vc70.idb
+	@install -p ${topdir}/src/vc70.pdb ${installdir}/lib/vc70.pdb
+	@install -d ${topdir}/include ${installdir}/include/
+	@install -p ${topdir}/include/ompi_config_bottom.h \
+                                  ${installdir}/include/ompi_config_bottom.h 
+	@install -p ${topdir}/src/win32/generated_include/ompi_config.h \
+                                  ${installdir}/include/ompi_config.h 
+	@install -p ${topdir}/include/mpi.h ${installdir}/include/mpi.h
+	@install -p ${topdir}/include/ompi_stdint.h ${installdir}/include/ompi_stdint.h
+	@install -d ${topdir}/src/win32 ${installdir}/include/win32
+	@install -p ${topdir}/src/win32/win_compat.h ${installdir}/include/win32/win_compat.h
 	@echo "done"
 
 .PHONY: clean
@@ -207,3 +208,4 @@ clean:
 	@for dirs in ${C_PPSUBDIRS}; do \
 	    (echo "Entering $$dirs"; cd $$dirs; rm -rf *.lib *.obj *.exp;); \
 	done
+	@echo "Entering ${topdir}/src/Debug ... "; cd ${topdir}/src/Debug; rm -rf *.lib *.obj *.exp *.c;