From 1cca889bbefc93fa1af01dcde0c6bd127a6b2f6b Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 13 Jul 2005 16:17:44 +0000 Subject: [PATCH] Move the compilation of SM to the "new" model. No Makefile in the src, everything get compiled directly in the sm directory. This commit was SVN r6461. --- ompi/mca/ptl/sm/Makefile.am | 33 ++++++++++++++++----- ompi/mca/ptl/sm/configure.params | 2 +- ompi/mca/ptl/sm/src/Makefile.am | 51 -------------------------------- 3 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 ompi/mca/ptl/sm/src/Makefile.am diff --git a/ompi/mca/ptl/sm/Makefile.am b/ompi/mca/ptl/sm/Makefile.am index 722c569334..d5c9c95c74 100644 --- a/ompi/mca/ptl/sm/Makefile.am +++ b/ompi/mca/ptl/sm/Makefile.am @@ -18,8 +18,6 @@ include $(top_ompi_srcdir)/config/Makefile.options -SUBDIRS = src - # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la # (for static builds). @@ -32,13 +30,34 @@ component_noinst = libmca_ptl_sm.la component_install = endif +EXTRA_DIST = +sm_SOURCES = src/ptl_sm.c src/ptl_sm.h src/ptl_sm_address.h src/ptl_sm_component.c \ + src/ptl_sm_frag.h src/ptl_sm_frag.c src/ptl_sm_peer.h src/ptl_sm_recvfrag.h \ + src/ptl_sm_recvfrag.c src/ptl_sm_send.c src/ptl_sm_sendreq.c \ + src/ptl_sm_sendreq.h src/ptl_sm_sendfrag.c src/ptl_sm_sendfrag.h + mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component_install) -mca_ptl_sm_la_SOURCES = -mca_ptl_sm_la_LIBADD = src/libmca_ptl_sm.la +mca_ptl_sm_la_SOURCES = $(sm_SOURCES) +mca_ptl_sm_la_DEPENDENCIES = librecompile.la +mca_ptl_sm_la_LIBADD = mca_ptl_sm_la_LDFLAGS = -module -avoid-version -noinst_LTLIBRARIES = $(component_noinst) -libmca_ptl_sm_la_SOURCES = -libmca_ptl_sm_la_LIBADD = src/libmca_ptl_sm.la +noinst_LTLIBRARIES = $(component_noinst) librecompile.la +libmca_ptl_sm_la_SOURCES = $(sm_SOURCES) +libmca_ptl_sm_la_DEPENDENCIES = librecompile.la +libmca_ptl_sm_la_LIBADD = libmca_ptl_sm_la_LDFLAGS = -module -avoid-version + +nodist_librecompile_la_SOURCES = src/ptl_sm_send_alternate.c +librecompile_la_CPPFLAGS = -DSM_COMMON_BASE_ADDR + +# +# The "send alternate" file is really the same as the "send" file, but +# compiled with a different #define +# +$(srcdir)/src/ptl_sm_send_alternate.c: + if test ! -f $@; then \ + ln -sf ptl_sm_send.c $@; \ + fi + diff --git a/ompi/mca/ptl/sm/configure.params b/ompi/mca/ptl/sm/configure.params index 56c1ce0b17..ba858fcdd3 100644 --- a/ompi/mca/ptl/sm/configure.params +++ b/ompi/mca/ptl/sm/configure.params @@ -19,4 +19,4 @@ PARAM_INIT_FILE=src/ptl_sm.c PARAM_CONFIG_HEADER_FILE="src/sm_config.h" -PARAM_CONFIG_FILES="Makefile src/Makefile" +PARAM_CONFIG_FILES="Makefile" diff --git a/ompi/mca/ptl/sm/src/Makefile.am b/ompi/mca/ptl/sm/src/Makefile.am deleted file mode 100644 index d820d65f0d..0000000000 --- a/ompi/mca/ptl/sm/src/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -# -# 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 (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -include $(top_ompi_srcdir)/config/Makefile.options - -noinst_LTLIBRARIES = libmca_ptl_sm.la librecompile.la -libmca_ptl_sm_la_LIBADD = librecompile.la -libmca_ptl_sm_la_SOURCES = \ - ptl_sm.c \ - ptl_sm.h \ - ptl_sm_address.h \ - ptl_sm_component.c \ - ptl_sm_frag.h \ - ptl_sm_frag.c \ - ptl_sm_peer.h \ - ptl_sm_recvfrag.h \ - ptl_sm_recvfrag.c \ - ptl_sm_send.c \ - ptl_sm_sendreq.c \ - ptl_sm_sendreq.h \ - ptl_sm_sendfrag.c \ - ptl_sm_sendfrag.h - -libmca_ptl_sm_la_DEPENDENCIES = librecompile.la - -nodist_librecompile_la_SOURCES = \ - ptl_sm_send_alternate.c -librecompile_la_CPPFLAGS = -DSM_COMMON_BASE_ADDR - -# -# The "send alternate" file is really the same as the "send" file, but -# compiled with a different #define -# -ptl_sm_send_alternate.c: - if test ! -f $@; then \ - ln -sf $(srcdir)/ptl_sm_send.c $@; \ - fi -