This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 89958058a63760b81afde2bc62ec7d60dacfe13e (commit) from 59cbc846d56eb259f6014b23114eed67b90abe95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/89958058a63760b81afde2bc62ec7d60da... commit 89958058a63760b81afde2bc62ec7d60dacfe13e Author: Rob Latham <[email protected]> Date: Fri Jun 28 13:50:10 2013 -0500 subdir-objects and top_srcdir/top_builddir conflict After adding the subdir-objects automake option, the autotools will try to create a directory called literally '$(top_srcdir)'/path/to/source to store .Plo files. with subdir-objects option, the top_srcdir and top_builddir variables are no longer needed (except in AM_CPPFLAGS and linker commands). *finally* gets hydra building again after yesterday's attempt to make automake-1.14 happy diff --git a/src/pm/hydra/pm/pmiserv/Makefile.mk b/src/pm/hydra/pm/pmiserv/Makefile.mk index 8561280..157b4e9 100644 --- a/src/pm/hydra/pm/pmiserv/Makefile.mk +++ b/src/pm/hydra/pm/pmiserv/Makefile.mk @@ -17,23 +17,23 @@ noinst_HEADERS += \ bin_PROGRAMS += hydra_pmi_proxy -hydra_pmi_proxy_SOURCES = $(top_srcdir)/pm/pmiserv/pmip.c \ - $(top_srcdir)/pm/pmiserv/pmip_cb.c \ - $(top_srcdir)/pm/pmiserv/pmip_utils.c \ - $(top_srcdir)/pm/pmiserv/pmip_pmi_v1.c \ - $(top_srcdir)/pm/pmiserv/pmip_pmi_v2.c \ - $(top_srcdir)/pm/pmiserv/common.c \ - $(top_srcdir)/pm/pmiserv/pmi_v2_common.c +hydra_pmi_proxy_SOURCES = pm/pmiserv/pmip.c \ + pm/pmiserv/pmip_cb.c \ + pm/pmiserv/pmip_utils.c \ + pm/pmiserv/pmip_pmi_v1.c \ + pm/pmiserv/pmip_pmi_v2.c \ + pm/pmiserv/common.c \ + pm/pmiserv/pmi_v2_common.c hydra_pmi_proxy_CFLAGS = $(AM_CFLAGS) hydra_pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_pmi_proxy_LDADD = -lhydra $(external_libs) hydra_pmi_proxy_DEPENDENCIES = libhydra.la -libpm_la_SOURCES += $(top_srcdir)/pm/pmiserv/pmiserv_pmi.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmi_v1.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmi_v2.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_pmci.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_cb.c \ - $(top_srcdir)/pm/pmiserv/pmiserv_utils.c \ - $(top_srcdir)/pm/pmiserv/common.c \ - $(top_srcdir)/pm/pmiserv/pmi_v2_common.c +libpm_la_SOURCES += pm/pmiserv/pmiserv_pmi.c \ + pm/pmiserv/pmiserv_pmi_v1.c \ + pm/pmiserv/pmiserv_pmi_v2.c \ + pm/pmiserv/pmiserv_pmci.c \ + pm/pmiserv/pmiserv_cb.c \ + pm/pmiserv/pmiserv_utils.c \ + pm/pmiserv/common.c \ + pm/pmiserv/pmi_v2_common.c diff --git a/src/pm/hydra/tools/bootstrap/external/Makefile.mk b/src/pm/hydra/tools/bootstrap/external/Makefile.mk index 91d5ee1..8cf57a5 100644 --- a/src/pm/hydra/tools/bootstrap/external/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/external/Makefile.mk @@ -15,48 +15,48 @@ noinst_HEADERS += \ tools/bootstrap/external/cobalt.h \ tools/bootstrap/external/ssh.h -libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/external/external_common.c \ - $(top_srcdir)/tools/bootstrap/external/external_common_launch.c \ - $(top_srcdir)/tools/bootstrap/external/fork_init.c \ - $(top_srcdir)/tools/bootstrap/external/user_init.c \ - $(top_srcdir)/tools/bootstrap/external/manual_init.c \ - $(top_srcdir)/tools/bootstrap/external/rsh_init.c \ - $(top_srcdir)/tools/bootstrap/external/rsh_env.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_init.c \ - $(top_srcdir)/tools/bootstrap/external/ssh.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_env.c \ - $(top_srcdir)/tools/bootstrap/external/ssh_finalize.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_init.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_launch.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_env.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/external/ll_init.c \ - $(top_srcdir)/tools/bootstrap/external/ll_launch.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/ll_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/external/ll_env.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_init.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/lsf_env.c \ - $(top_srcdir)/tools/bootstrap/external/sge_init.c \ - $(top_srcdir)/tools/bootstrap/external/sge_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/sge_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/sge_env.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_init.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_init.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/cobalt_query_node_list.c +libhydra_la_SOURCES += tools/bootstrap/external/external_common.c \ + tools/bootstrap/external/external_common_launch.c \ + tools/bootstrap/external/fork_init.c \ + tools/bootstrap/external/user_init.c \ + tools/bootstrap/external/manual_init.c \ + tools/bootstrap/external/rsh_init.c \ + tools/bootstrap/external/rsh_env.c \ + tools/bootstrap/external/ssh_init.c \ + tools/bootstrap/external/ssh.c \ + tools/bootstrap/external/ssh_env.c \ + tools/bootstrap/external/ssh_finalize.c \ + tools/bootstrap/external/slurm_init.c \ + tools/bootstrap/external/slurm_launch.c \ + tools/bootstrap/external/slurm_env.c \ + tools/bootstrap/external/slurm_query_native_int.c \ + tools/bootstrap/external/slurm_query_node_list.c \ + tools/bootstrap/external/slurm_query_proxy_id.c \ + tools/bootstrap/external/ll_init.c \ + tools/bootstrap/external/ll_launch.c \ + tools/bootstrap/external/ll_query_native_int.c \ + tools/bootstrap/external/ll_query_node_list.c \ + tools/bootstrap/external/ll_query_proxy_id.c \ + tools/bootstrap/external/ll_env.c \ + tools/bootstrap/external/lsf_init.c \ + tools/bootstrap/external/lsf_query_native_int.c \ + tools/bootstrap/external/lsf_query_node_list.c \ + tools/bootstrap/external/lsf_env.c \ + tools/bootstrap/external/sge_init.c \ + tools/bootstrap/external/sge_query_native_int.c \ + tools/bootstrap/external/sge_query_node_list.c \ + tools/bootstrap/external/sge_env.c \ + tools/bootstrap/external/pbs_init.c \ + tools/bootstrap/external/pbs_query_native_int.c \ + tools/bootstrap/external/pbs_query_node_list.c \ + tools/bootstrap/external/cobalt_init.c \ + tools/bootstrap/external/cobalt_query_native_int.c \ + tools/bootstrap/external/cobalt_query_node_list.c if hydra_pbs_launcher libhydra_la_SOURCES += \ - $(top_srcdir)/tools/bootstrap/external/pbs_finalize.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_launch.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_wait.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_env.c + tools/bootstrap/external/pbs_finalize.c \ + tools/bootstrap/external/pbs_launch.c \ + tools/bootstrap/external/pbs_wait.c \ + tools/bootstrap/external/pbs_env.c endif diff --git a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk index 28d6870..564c36f 100644 --- a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk @@ -6,7 +6,7 @@ bin_PROGRAMS += hydra_persist -hydra_persist_SOURCES = $(top_srcdir)/tools/bootstrap/persist/persist_server.c +hydra_persist_SOURCES = tools/bootstrap/persist/persist_server.c hydra_persist_CFLAGS = $(AM_CFLAGS) hydra_persist_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_persist_LDADD = -lhydra $(external_libs) @@ -17,6 +17,6 @@ noinst_HEADERS += \ tools/bootstrap/persist/persist_client.h \ tools/bootstrap/persist/persist_server.h -libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/persist/persist_init.c \ - $(top_srcdir)/tools/bootstrap/persist/persist_launch.c \ - $(top_srcdir)/tools/bootstrap/persist/persist_wait.c +libhydra_la_SOURCES += tools/bootstrap/persist/persist_init.c \ + tools/bootstrap/persist/persist_launch.c \ + tools/bootstrap/persist/persist_wait.c diff --git a/src/pm/hydra/tools/bootstrap/src/Makefile.mk b/src/pm/hydra/tools/bootstrap/src/Makefile.mk index 228faf6..785b0e8 100644 --- a/src/pm/hydra/tools/bootstrap/src/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/src/Makefile.mk @@ -4,11 +4,11 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_builddir)/tools/bootstrap/src/bsci_init.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_finalize.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_launch.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_wait.c \ - $(top_srcdir)/tools/bootstrap/src/bsci_env.c +libhydra_la_SOURCES += tools/bootstrap/src/bsci_init.c \ + tools/bootstrap/src/bsci_finalize.c \ + tools/bootstrap/src/bsci_launch.c \ + tools/bootstrap/src/bsci_query_node_list.c \ + tools/bootstrap/src/bsci_query_proxy_id.c \ + tools/bootstrap/src/bsci_query_native_int.c \ + tools/bootstrap/src/bsci_wait.c \ + tools/bootstrap/src/bsci_env.c diff --git a/src/pm/hydra/tools/bootstrap/utils/Makefile.mk b/src/pm/hydra/tools/bootstrap/utils/Makefile.mk index 25c6daa..f3d3f25 100644 --- a/src/pm/hydra/tools/bootstrap/utils/Makefile.mk +++ b/src/pm/hydra/tools/bootstrap/utils/Makefile.mk @@ -9,5 +9,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/bootstrap/utils noinst_HEADERS += tools/bootstrap/utils/bscu.h libhydra_la_SOURCES += \ - $(top_srcdir)/tools/bootstrap/utils/bscu_wait.c \ - $(top_srcdir)/tools/bootstrap/utils/bscu_cb.c + tools/bootstrap/utils/bscu_wait.c \ + tools/bootstrap/utils/bscu_cb.c diff --git a/src/pm/hydra/tools/ckpoint/Makefile.mk b/src/pm/hydra/tools/ckpoint/Makefile.mk index 2fa7303..a47bab2 100644 --- a/src/pm/hydra/tools/ckpoint/Makefile.mk +++ b/src/pm/hydra/tools/ckpoint/Makefile.mk @@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ckpoint noinst_HEADERS += tools/ckpoint/ckpoint.h -libhydra_la_SOURCES += $(top_srcdir)/tools/ckpoint/ckpoint.c +libhydra_la_SOURCES += tools/ckpoint/ckpoint.c if hydra_have_blcr include tools/ckpoint/blcr/Makefile.mk diff --git a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk index 80163fe..ea66342 100644 --- a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk +++ b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/tools/ckpoint/blcr/ckpoint_blcr.c +libhydra_la_SOURCES += tools/ckpoint/blcr/ckpoint_blcr.c noinst_HEADERS += tools/ckpoint/blcr/ckpoint_blcr.h diff --git a/src/pm/hydra/tools/debugger/Makefile.mk b/src/pm/hydra/tools/debugger/Makefile.mk index 860b88c..0cb2078 100644 --- a/src/pm/hydra/tools/debugger/Makefile.mk +++ b/src/pm/hydra/tools/debugger/Makefile.mk @@ -8,4 +8,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/debugger noinst_HEADERS += tools/debugger/debugger.h -libhydra_la_SOURCES += $(top_srcdir)/tools/debugger/debugger.c +libhydra_la_SOURCES += tools/debugger/debugger.c diff --git a/src/pm/hydra/tools/demux/Makefile.mk b/src/pm/hydra/tools/demux/Makefile.mk index 3097781..127537e 100644 --- a/src/pm/hydra/tools/demux/Makefile.mk +++ b/src/pm/hydra/tools/demux/Makefile.mk @@ -8,12 +8,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/demux noinst_HEADERS += tools/demux/demux.h tools/demux/demux_internal.h -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux.c +libhydra_la_SOURCES += tools/demux/demux.c if hydra_have_poll -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_poll.c +libhydra_la_SOURCES += tools/demux/demux_poll.c endif if hydra_have_select -libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_select.c +libhydra_la_SOURCES += tools/demux/demux_select.c endif diff --git a/src/pm/hydra/tools/ftb/Makefile.mk b/src/pm/hydra/tools/ftb/Makefile.mk index db605af..f48d74e 100644 --- a/src/pm/hydra/tools/ftb/Makefile.mk +++ b/src/pm/hydra/tools/ftb/Makefile.mk @@ -9,7 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ftb noinst_HEADERS += tools/ftb/hydt_ftb.h if hydra_have_ftb -libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb.c +libhydra_la_SOURCES += tools/ftb/hydt_ftb.c else -libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb_dummy.c +libhydra_la_SOURCES += tools/ftb/hydt_ftb_dummy.c endif diff --git a/src/pm/hydra/tools/nameserver/Makefile.mk b/src/pm/hydra/tools/nameserver/Makefile.mk index bb362e1..e8a19fb 100644 --- a/src/pm/hydra/tools/nameserver/Makefile.mk +++ b/src/pm/hydra/tools/nameserver/Makefile.mk @@ -6,8 +6,8 @@ bin_PROGRAMS += hydra_nameserver -hydra_nameserver_SOURCES = $(top_srcdir)/tools/nameserver/hydra_nameserver.c +hydra_nameserver_SOURCES = tools/nameserver/hydra_nameserver.c hydra_nameserver_CFLAGS = $(AM_CFLAGS) -hydra_nameserver_LDFLAGS = $(external_ldflags) -L$(top_builddir) +hydra_nameserver_LDFLAGS = $(external_ldflags) hydra_nameserver_LDADD = -lhydra $(external_libs) hydra_nameserver_DEPENDENCIES = libhydra.la diff --git a/src/pm/hydra/tools/topo/Makefile.mk b/src/pm/hydra/tools/topo/Makefile.mk index 0e43c95..55751df 100644 --- a/src/pm/hydra/tools/topo/Makefile.mk +++ b/src/pm/hydra/tools/topo/Makefile.mk @@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/topo noinst_HEADERS += tools/topo/topo.h -libhydra_la_SOURCES += $(top_srcdir)/tools/topo/topo.c +libhydra_la_SOURCES += tools/topo/topo.c if hydra_have_hwloc include tools/topo/hwloc/Makefile.mk diff --git a/src/pm/hydra/tools/topo/hwloc/Makefile.mk b/src/pm/hydra/tools/topo/hwloc/Makefile.mk index 01b8ce7..7dc6482 100644 --- a/src/pm/hydra/tools/topo/hwloc/Makefile.mk +++ b/src/pm/hydra/tools/topo/hwloc/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/tools/topo/hwloc/topo_hwloc.c +libhydra_la_SOURCES += tools/topo/hwloc/topo_hwloc.c noinst_HEADERS += tools/topo/hwloc/topo_hwloc.h diff --git a/src/pm/hydra/ui/mpich/Makefile.mk b/src/pm/hydra/ui/mpich/Makefile.mk index 029116f..aad94a8 100644 --- a/src/pm/hydra/ui/mpich/Makefile.mk +++ b/src/pm/hydra/ui/mpich/Makefile.mk @@ -10,7 +10,7 @@ noinst_HEADERS += ui/mpich/mpiexec.h bin_PROGRAMS += mpiexec.hydra -mpiexec_hydra_SOURCES = $(top_srcdir)/ui/mpich/mpiexec.c $(top_srcdir)/ui/mpich/utils.c +mpiexec_hydra_SOURCES = ui/mpich/mpiexec.c ui/mpich/utils.c mpiexec_hydra_LDFLAGS = $(external_ldflags) -L$(top_builddir) mpiexec_hydra_LDADD = -lpm -lhydra $(external_libs) mpiexec_hydra_DEPENDENCIES = libpm.la libhydra.la diff --git a/src/pm/hydra/ui/utils/Makefile.mk b/src/pm/hydra/ui/utils/Makefile.mk index 105a90a..5b51ad5 100644 --- a/src/pm/hydra/ui/utils/Makefile.mk +++ b/src/pm/hydra/ui/utils/Makefile.mk @@ -4,7 +4,7 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/ui/utils/uiu.c +libhydra_la_SOURCES += ui/utils/uiu.c noinst_HEADERS += ui/utils/uiu.h diff --git a/src/pm/hydra/utils/alloc/Makefile.mk b/src/pm/hydra/utils/alloc/Makefile.mk index 52b6ca1..0dbdcd6 100644 --- a/src/pm/hydra/utils/alloc/Makefile.mk +++ b/src/pm/hydra/utils/alloc/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/alloc/alloc.c +libhydra_la_SOURCES += utils/alloc/alloc.c diff --git a/src/pm/hydra/utils/args/Makefile.mk b/src/pm/hydra/utils/args/Makefile.mk index 77959a8..5d3673c 100644 --- a/src/pm/hydra/utils/args/Makefile.mk +++ b/src/pm/hydra/utils/args/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/args/args.c +libhydra_la_SOURCES += utils/args/args.c diff --git a/src/pm/hydra/utils/dbg/Makefile.mk b/src/pm/hydra/utils/dbg/Makefile.mk index bcf2abb..c89023b 100644 --- a/src/pm/hydra/utils/dbg/Makefile.mk +++ b/src/pm/hydra/utils/dbg/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/dbg/dbg.c +libhydra_la_SOURCES += utils/dbg/dbg.c diff --git a/src/pm/hydra/utils/env/Makefile.mk b/src/pm/hydra/utils/env/Makefile.mk index 0cb53c4..01a7f6a 100644 --- a/src/pm/hydra/utils/env/Makefile.mk +++ b/src/pm/hydra/utils/env/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/env/env.c +libhydra_la_SOURCES += utils/env/env.c diff --git a/src/pm/hydra/utils/launch/Makefile.mk b/src/pm/hydra/utils/launch/Makefile.mk index 23b6a47..92cb377 100644 --- a/src/pm/hydra/utils/launch/Makefile.mk +++ b/src/pm/hydra/utils/launch/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/launch/launch.c +libhydra_la_SOURCES += utils/launch/launch.c diff --git a/src/pm/hydra/utils/others/Makefile.mk b/src/pm/hydra/utils/others/Makefile.mk index a0d3c92..bab6dec 100644 --- a/src/pm/hydra/utils/others/Makefile.mk +++ b/src/pm/hydra/utils/others/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/others/others.c +libhydra_la_SOURCES += utils/others/others.c diff --git a/src/pm/hydra/utils/signals/Makefile.mk b/src/pm/hydra/utils/signals/Makefile.mk index 3a9d416..84ed3c2 100644 --- a/src/pm/hydra/utils/signals/Makefile.mk +++ b/src/pm/hydra/utils/signals/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/signals/signals.c +libhydra_la_SOURCES += utils/signals/signals.c diff --git a/src/pm/hydra/utils/sock/Makefile.mk b/src/pm/hydra/utils/sock/Makefile.mk index fc2790c..5af92c4 100644 --- a/src/pm/hydra/utils/sock/Makefile.mk +++ b/src/pm/hydra/utils/sock/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/sock/sock.c +libhydra_la_SOURCES += utils/sock/sock.c diff --git a/src/pm/hydra/utils/string/Makefile.mk b/src/pm/hydra/utils/string/Makefile.mk index f5f3fcf..eeebe7b 100644 --- a/src/pm/hydra/utils/string/Makefile.mk +++ b/src/pm/hydra/utils/string/Makefile.mk @@ -4,4 +4,4 @@ ## See COPYRIGHT in top-level directory. ## -libhydra_la_SOURCES += $(top_srcdir)/utils/string/string.c +libhydra_la_SOURCES += utils/string/string.c ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/pm/pmiserv/Makefile.mk | 30 ++++---- src/pm/hydra/tools/bootstrap/external/Makefile.mk | 82 ++++++++++---------- src/pm/hydra/tools/bootstrap/persist/Makefile.mk | 8 +- src/pm/hydra/tools/bootstrap/src/Makefile.mk | 16 ++-- src/pm/hydra/tools/bootstrap/utils/Makefile.mk | 4 +- src/pm/hydra/tools/ckpoint/Makefile.mk | 2 +- src/pm/hydra/tools/ckpoint/blcr/Makefile.mk | 2 +- src/pm/hydra/tools/debugger/Makefile.mk | 2 +- src/pm/hydra/tools/demux/Makefile.mk | 6 +- src/pm/hydra/tools/ftb/Makefile.mk | 4 +- src/pm/hydra/tools/nameserver/Makefile.mk | 4 +- src/pm/hydra/tools/topo/Makefile.mk | 2 +- src/pm/hydra/tools/topo/hwloc/Makefile.mk | 2 +- src/pm/hydra/ui/mpich/Makefile.mk | 2 +- src/pm/hydra/ui/utils/Makefile.mk | 2 +- src/pm/hydra/utils/alloc/Makefile.mk | 2 +- src/pm/hydra/utils/args/Makefile.mk | 2 +- src/pm/hydra/utils/dbg/Makefile.mk | 2 +- src/pm/hydra/utils/env/Makefile.mk | 2 +- src/pm/hydra/utils/launch/Makefile.mk | 2 +- src/pm/hydra/utils/others/Makefile.mk | 2 +- src/pm/hydra/utils/signals/Makefile.mk | 2 +- src/pm/hydra/utils/sock/Makefile.mk | 2 +- src/pm/hydra/utils/string/Makefile.mk | 2 +- 24 files changed, 93 insertions(+), 93 deletions(-) hooks/post-receive -- MPICH primary repository