Per recent off-list discussions about the build system, I have done
some cleanups and standardizations in the various */tools/*/ Makefile.am files. This commit: * Somewhat simplify the tool Makefile.am's * Makes the tool Makefile.am's consistent with each other (do similar actions in similar ways) * Update the tool Makefile.am's to remove old kruft that was required by older versions of AM (trunk requires AM >=1.10) This commit was SVN r17921.
Этот коммит содержится в:
Jeff Squyres
родитель
ace1717ca7
Коммит
dee561d29e
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -18,22 +19,14 @@
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = ompi-server
|
||||
|
||||
dist_pkgdata_DATA = help-ompi-server.txt
|
||||
|
||||
bin_PROGRAMS = ompi-server
|
||||
dist_man_MANS = ompi-server.1
|
||||
|
||||
endif
|
||||
|
||||
libs = \
|
||||
$(top_builddir)/ompi/libmpi.la
|
||||
ompi_server_SOURCES = ompi-server.c
|
||||
ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la
|
||||
|
||||
ompi_server_SOURCES = \
|
||||
ompi-server.c
|
||||
ompi_server_LDADD = $(libs)
|
||||
ompi_server_LDFLAGS =
|
||||
ompi_server_DEPENDENCIES = $(libs)
|
||||
|
||||
# AM 1.9.6 seems to have a bug in its dependencies for install-man if
|
||||
# dist_ and nodist_ are used, so explicitly add to EXTRA_DIST...
|
||||
man_MANS = ompi-server.1
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -39,15 +40,13 @@ AM_CPPFLAGS = \
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
dist_pkgdata_DATA = help-ompi_info.txt
|
||||
|
||||
bin_PROGRAMS = ompi_info
|
||||
|
||||
endif
|
||||
dist_pkgdata_DATA = help-ompi_info.txt
|
||||
|
||||
libs = \
|
||||
$(top_builddir)/ompi/libmpi.la \
|
||||
$(top_builddir)/opal/libopen-pal.la
|
||||
dist_man_MANS = ompi_info.1
|
||||
|
||||
endif
|
||||
|
||||
ompi_info_SOURCES = \
|
||||
components.cc \
|
||||
@ -56,14 +55,7 @@ ompi_info_SOURCES = \
|
||||
output.cc \
|
||||
param.cc \
|
||||
version.cc
|
||||
ompi_info_LDADD = $(libs)
|
||||
ompi_info_LDFLAGS =
|
||||
ompi_info_DEPENDENCIES = $(libs)
|
||||
|
||||
# AM 1.9.6 seems to have a bug in its dependencies for install-man if
|
||||
# dist_ and nodist_ are used, so explicitly add to EXTRA_DIST...
|
||||
man_MANS = ompi_info.1
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
|
||||
|
||||
clean-local:
|
||||
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -18,12 +19,11 @@
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
dist_pkgdata_DATA =
|
||||
|
||||
man_MANS = mpirun.1 \
|
||||
mpiexec.1 \
|
||||
ompi-ps.1 \
|
||||
ompi-clean.1
|
||||
dist_man_MANS =\
|
||||
mpirun.1 \
|
||||
mpiexec.1 \
|
||||
ompi-ps.1 \
|
||||
ompi-clean.1
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
|
||||
@ -37,6 +37,8 @@ uninstall-local:
|
||||
$(DESTDIR)$(bindir)/ompi-ps$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT)
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
|
||||
cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
|
||||
|
||||
@ -51,5 +53,3 @@ ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
|
||||
|
||||
distclean-local:
|
||||
rm -f mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -17,27 +17,21 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
EXTRA_DIST = \
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
dist_man_MANS = \
|
||||
mpicc.1 \
|
||||
mpic++.1 \
|
||||
mpicxx.1 \
|
||||
mpif77.1 \
|
||||
mpif90.1
|
||||
|
||||
dist_pkgdata_DATA = mpicc-wrapper-data.txt \
|
||||
dist_pkgdata_DATA = \
|
||||
mpicc-wrapper-data.txt \
|
||||
mpic++-wrapper-data.txt \
|
||||
mpif77-wrapper-data.txt \
|
||||
mpif90-wrapper-data.txt
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
man_MANS = \
|
||||
mpicc.1 \
|
||||
mpic++.1 \
|
||||
mpicxx.1 \
|
||||
mpif77.1 \
|
||||
mpif90.1
|
||||
|
||||
install-exec-hook-always:
|
||||
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpicc$(EXEEXT); $(LN_S) opal_wrapper mpicc)
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -16,19 +17,16 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-opal-checkpoint.txt
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = opal-checkpoint
|
||||
|
||||
opal_checkpoint_SOURCES = \
|
||||
opal-checkpoint.c
|
||||
dist_man_MANS = opal-checkpoint.1
|
||||
|
||||
# Manual pages
|
||||
man_MANS = opal-checkpoint.1
|
||||
EXTRA_DIST = opal-checkpoint.1
|
||||
dist_pkgdata_DATA = help-opal-checkpoint.txt
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
opal_checkpoint_SOURCES = opal-checkpoint.c
|
||||
opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
opal_checkpoint_DEPENDENCIES = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -16,19 +17,16 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-opal-restart.txt
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = opal-restart
|
||||
|
||||
opal_restart_SOURCES = \
|
||||
opal-restart.c
|
||||
dist_man_MANS = opal-restart.1
|
||||
|
||||
# Manual pages
|
||||
man_MANS = opal-restart.1
|
||||
EXTRA_DIST = opal-restart.1
|
||||
dist_pkgdata_DATA = help-opal-restart.txt
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
opal_restart_SOURCES = opal-restart.c
|
||||
opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
opal_restart_DEPENDENCIES = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -19,48 +19,24 @@
|
||||
|
||||
DEFS="-DEXEEXT=\"$(EXEEXT)\""
|
||||
|
||||
EXTRA_DIST = \
|
||||
generic_wrapper.1 \
|
||||
opal_wrapper.1 \
|
||||
opalcc.1 \
|
||||
opalc++.1
|
||||
|
||||
man_MANS = opal_wrapper.1
|
||||
EXTRA_DIST = generic_wrapper.1
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
# install even if we don't want the headers / opalcc, as we need it
|
||||
# for the MPI layer
|
||||
opal_wrapper_SOURCES = \
|
||||
opal_wrapper.c
|
||||
|
||||
opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
opal_wrapper_DEPENDENCIES = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
bin_PROGRAMS = opal_wrapper
|
||||
|
||||
dist_pkgdata_DATA = \
|
||||
help-opal-wrapper.txt
|
||||
dist_man_MANS = opal_wrapper.1
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
dist_pkgdata_DATA = help-opal-wrapper.txt
|
||||
|
||||
# Only install the following for developer-level installs
|
||||
if WANT_INSTALL_HEADERS
|
||||
|
||||
nodist_pkgdata_DATA = \
|
||||
opalcc-wrapper-data.txt \
|
||||
opalc++-wrapper-data.txt
|
||||
|
||||
# Whether or not --enable-binaries was given to configure (useful for
|
||||
# multi-lib installations). If this was not given, we do not build /
|
||||
# install the applications / man pages
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
# List all man pages that will be installed
|
||||
|
||||
man_MANS += \
|
||||
opalcc.1 \
|
||||
opalc++.1
|
||||
dist_man_MANS += opalcc.1 opalc++.1
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f opalcc$(EXEEXT); $(LN_S) opal_wrapper opalcc)
|
||||
@ -70,10 +46,13 @@ uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/opalcc$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/opalc++$(EXEEXT)
|
||||
|
||||
endif # OPAL_INSTALL_BINARIES
|
||||
|
||||
endif # WANT_INSTALL_HEADERS
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
opal_wrapper_SOURCES = opal_wrapper.c
|
||||
opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la
|
||||
|
||||
maintainer-clean-local:
|
||||
rm -f opalcc.1 opalc++.1
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -16,21 +17,13 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-orte-checkpoint.txt
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orte-checkpoint
|
||||
|
||||
orte_checkpoint_SOURCES = \
|
||||
orte-checkpoint.c
|
||||
dist_man_MANS = orte-checkpoint.1 ompi-checkpoint.1
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-checkpoint.1 ompi-checkpoint.1
|
||||
EXTRA_DIST = orte-checkpoint.1
|
||||
|
||||
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
orte_checkpoint_DEPENDENCIES = $(top_builddir)/orte/libopen-rte.la
|
||||
dist_pkgdata_DATA = help-orte-checkpoint.txt
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-checkpoint$(EXEEXT); $(LN_S) orte-checkpoint$(EXEEXT) ompi-checkpoint$(EXEEXT))
|
||||
@ -38,9 +31,13 @@ install-exec-hook:
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/ompi-checkpoint$(EXEEXT)
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
orte_checkpoint_SOURCES = orte-checkpoint.c
|
||||
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
ompi-checkpoint.1: $(top_srcdir)/orte/tools/orte-checkpoint/orte-checkpoint.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-checkpoint/orte-checkpoint.1 ompi-checkpoint.1
|
||||
|
||||
distclean-local:
|
||||
rm -f ompi-checkpoint.1
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -18,21 +19,13 @@
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-orte-clean.txt
|
||||
|
||||
bin_PROGRAMS = orte-clean
|
||||
|
||||
orte_clean_SOURCES = \
|
||||
orte-clean.c
|
||||
dist_man_MANS = orte-clean.1
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-clean.1
|
||||
EXTRA_DIST = orte-clean.1
|
||||
|
||||
orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
orte_clean_DEPENDENCIES = $(top_builddir)/orte/libopen-rte.la
|
||||
dist_pkgdata_DATA = help-orte-clean.txt
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
orte_clean_SOURCES = orte-clean.c
|
||||
orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -18,20 +19,13 @@
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-orte-ps.txt
|
||||
|
||||
bin_PROGRAMS = orte-ps
|
||||
|
||||
orte_ps_SOURCES = \
|
||||
orte-ps.c
|
||||
dist_man_MANS = orte-ps.1
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-ps.1
|
||||
EXTRA_DIST = orte-ps.1
|
||||
|
||||
orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
orte_ps_DEPENDENCIES = $(top_builddir)/orte/libopen-rte.la
|
||||
dist_pkgdata_DATA = help-orte-ps.txt
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
orte_ps_SOURCES = orte-ps.c
|
||||
orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -16,23 +17,13 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
nodist_pkgdata_DATA =
|
||||
dist_pkgdata_DATA = \
|
||||
help-orte-restart.txt
|
||||
|
||||
orte_restart_SOURCES = \
|
||||
orte-restart.c
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orte-restart
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-restart.1 ompi-restart.1
|
||||
EXTRA_DIST = orte-restart.1
|
||||
dist_man_MANS = orte-restart.1 ompi-restart.1
|
||||
|
||||
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
orte_restart_DEPENDENCIES = $(top_builddir)/orte/libopen-rte.la
|
||||
dist_pkgdata_DATA = help-orte-restart.txt
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-restart$(EXEEXT); $(LN_S) orte-restart$(EXEEXT) ompi-restart$(EXEEXT))
|
||||
@ -40,9 +31,13 @@ install-exec-hook:
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/ompi-restart$(EXEEXT)
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
orte_restart_SOURCES = orte-restart.c
|
||||
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
ompi-restart.1: $(top_srcdir)/orte/tools/orte-restart/orte-restart.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-restart/orte-restart.1 ompi-restart.1
|
||||
|
||||
distclean-local:
|
||||
rm -f ompi-restart.1
|
||||
endif
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2007 Cisco, Inc. All rights reserved.
|
||||
# Copyright (c) 2007-2008 Cisco, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -21,27 +21,9 @@ if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orted
|
||||
|
||||
endif
|
||||
dist_man_MANS = orted.1
|
||||
|
||||
libs = \
|
||||
$(top_builddir)/orte/libopen-rte.la
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
man_MANS = orted.1
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
||||
orted_SOURCES = \
|
||||
orted.c
|
||||
|
||||
orted_LDADD = $(libs)
|
||||
orted_LDFLAGS =
|
||||
orted_DEPENDENCIES = $(libs)
|
||||
|
||||
|
||||
# Conditionally install the header files
|
||||
|
||||
if WANT_INSTALL_HEADERS
|
||||
ortedir = $(includedir)/openmpi/orte/tools/orted
|
||||
else
|
||||
ortedir = $(includedir)
|
||||
endif
|
||||
orted_SOURCES = orted.c
|
||||
orted_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -25,9 +26,15 @@
|
||||
|
||||
CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(TOTALVIEW_DEBUG_FLAGS)
|
||||
|
||||
libs = \
|
||||
$(top_builddir)/opal/libopen-pal.la \
|
||||
$(top_builddir)/orte/libopen-rte.la
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orterun
|
||||
|
||||
dist_man_MANS = orterun.1
|
||||
|
||||
dist_pkgdata_DATA = help-orterun.txt
|
||||
|
||||
endif # OMPI_INSTALL_BINARIES
|
||||
|
||||
orterun_SOURCES = \
|
||||
main.c \
|
||||
@ -35,19 +42,4 @@ orterun_SOURCES = \
|
||||
orterun.h \
|
||||
totalview.c \
|
||||
totalview.h
|
||||
|
||||
orterun_LDADD = $(libs)
|
||||
orterun_DEPENDENCIES = $(libs)
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
bin_PROGRAMS = orterun
|
||||
|
||||
dist_pkgdata_DATA = help-orterun.txt
|
||||
|
||||
# AM 1.9.6 seems to have a bug in it's dependencies for install-man if
|
||||
#dist_ and nodist_ are used, so explicitly add to EXTRA_DIST...
|
||||
man_MANS = orterun.1
|
||||
EXTRA_DIST = orterun.1
|
||||
|
||||
endif
|
||||
orterun_LDADD = $(top_builddir)/orte/libopen-rte.la
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -17,10 +17,6 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
EXTRA_DIST = \
|
||||
ortecc.1 \
|
||||
ortec++.1
|
||||
|
||||
if WANT_INSTALL_HEADERS
|
||||
|
||||
nodist_pkgdata_DATA = \
|
||||
@ -29,7 +25,7 @@ nodist_pkgdata_DATA = \
|
||||
|
||||
if OMPI_INSTALL_BINARIES
|
||||
|
||||
man_MANS = \
|
||||
dist_man_MANS = \
|
||||
ortecc.1 \
|
||||
ortec++.1
|
||||
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user