Commit 89958058 authored by Rob Latham's avatar Rob Latham
Browse files

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
parent 59cbc846
...@@ -17,23 +17,23 @@ noinst_HEADERS += \ ...@@ -17,23 +17,23 @@ noinst_HEADERS += \
bin_PROGRAMS += hydra_pmi_proxy bin_PROGRAMS += hydra_pmi_proxy
hydra_pmi_proxy_SOURCES = $(top_srcdir)/pm/pmiserv/pmip.c \ hydra_pmi_proxy_SOURCES = pm/pmiserv/pmip.c \
$(top_srcdir)/pm/pmiserv/pmip_cb.c \ pm/pmiserv/pmip_cb.c \
$(top_srcdir)/pm/pmiserv/pmip_utils.c \ pm/pmiserv/pmip_utils.c \
$(top_srcdir)/pm/pmiserv/pmip_pmi_v1.c \ pm/pmiserv/pmip_pmi_v1.c \
$(top_srcdir)/pm/pmiserv/pmip_pmi_v2.c \ pm/pmiserv/pmip_pmi_v2.c \
$(top_srcdir)/pm/pmiserv/common.c \ pm/pmiserv/common.c \
$(top_srcdir)/pm/pmiserv/pmi_v2_common.c pm/pmiserv/pmi_v2_common.c
hydra_pmi_proxy_CFLAGS = $(AM_CFLAGS) hydra_pmi_proxy_CFLAGS = $(AM_CFLAGS)
hydra_pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_pmi_proxy_LDFLAGS = $(external_ldflags) -L$(top_builddir)
hydra_pmi_proxy_LDADD = -lhydra $(external_libs) hydra_pmi_proxy_LDADD = -lhydra $(external_libs)
hydra_pmi_proxy_DEPENDENCIES = libhydra.la hydra_pmi_proxy_DEPENDENCIES = libhydra.la
libpm_la_SOURCES += $(top_srcdir)/pm/pmiserv/pmiserv_pmi.c \ libpm_la_SOURCES += pm/pmiserv/pmiserv_pmi.c \
$(top_srcdir)/pm/pmiserv/pmiserv_pmi_v1.c \ pm/pmiserv/pmiserv_pmi_v1.c \
$(top_srcdir)/pm/pmiserv/pmiserv_pmi_v2.c \ pm/pmiserv/pmiserv_pmi_v2.c \
$(top_srcdir)/pm/pmiserv/pmiserv_pmci.c \ pm/pmiserv/pmiserv_pmci.c \
$(top_srcdir)/pm/pmiserv/pmiserv_cb.c \ pm/pmiserv/pmiserv_cb.c \
$(top_srcdir)/pm/pmiserv/pmiserv_utils.c \ pm/pmiserv/pmiserv_utils.c \
$(top_srcdir)/pm/pmiserv/common.c \ pm/pmiserv/common.c \
$(top_srcdir)/pm/pmiserv/pmi_v2_common.c pm/pmiserv/pmi_v2_common.c
...@@ -15,48 +15,48 @@ noinst_HEADERS += \ ...@@ -15,48 +15,48 @@ noinst_HEADERS += \
tools/bootstrap/external/cobalt.h \ tools/bootstrap/external/cobalt.h \
tools/bootstrap/external/ssh.h tools/bootstrap/external/ssh.h
libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/external/external_common.c \ libhydra_la_SOURCES += tools/bootstrap/external/external_common.c \
$(top_srcdir)/tools/bootstrap/external/external_common_launch.c \ tools/bootstrap/external/external_common_launch.c \
$(top_srcdir)/tools/bootstrap/external/fork_init.c \ tools/bootstrap/external/fork_init.c \
$(top_srcdir)/tools/bootstrap/external/user_init.c \ tools/bootstrap/external/user_init.c \
$(top_srcdir)/tools/bootstrap/external/manual_init.c \ tools/bootstrap/external/manual_init.c \
$(top_srcdir)/tools/bootstrap/external/rsh_init.c \ tools/bootstrap/external/rsh_init.c \
$(top_srcdir)/tools/bootstrap/external/rsh_env.c \ tools/bootstrap/external/rsh_env.c \
$(top_srcdir)/tools/bootstrap/external/ssh_init.c \ tools/bootstrap/external/ssh_init.c \
$(top_srcdir)/tools/bootstrap/external/ssh.c \ tools/bootstrap/external/ssh.c \
$(top_srcdir)/tools/bootstrap/external/ssh_env.c \ tools/bootstrap/external/ssh_env.c \
$(top_srcdir)/tools/bootstrap/external/ssh_finalize.c \ tools/bootstrap/external/ssh_finalize.c \
$(top_srcdir)/tools/bootstrap/external/slurm_init.c \ tools/bootstrap/external/slurm_init.c \
$(top_srcdir)/tools/bootstrap/external/slurm_launch.c \ tools/bootstrap/external/slurm_launch.c \
$(top_srcdir)/tools/bootstrap/external/slurm_env.c \ tools/bootstrap/external/slurm_env.c \
$(top_srcdir)/tools/bootstrap/external/slurm_query_native_int.c \ tools/bootstrap/external/slurm_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/slurm_query_node_list.c \ tools/bootstrap/external/slurm_query_node_list.c \
$(top_srcdir)/tools/bootstrap/external/slurm_query_proxy_id.c \ tools/bootstrap/external/slurm_query_proxy_id.c \
$(top_srcdir)/tools/bootstrap/external/ll_init.c \ tools/bootstrap/external/ll_init.c \
$(top_srcdir)/tools/bootstrap/external/ll_launch.c \ tools/bootstrap/external/ll_launch.c \
$(top_srcdir)/tools/bootstrap/external/ll_query_native_int.c \ tools/bootstrap/external/ll_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/ll_query_node_list.c \ tools/bootstrap/external/ll_query_node_list.c \
$(top_srcdir)/tools/bootstrap/external/ll_query_proxy_id.c \ tools/bootstrap/external/ll_query_proxy_id.c \
$(top_srcdir)/tools/bootstrap/external/ll_env.c \ tools/bootstrap/external/ll_env.c \
$(top_srcdir)/tools/bootstrap/external/lsf_init.c \ tools/bootstrap/external/lsf_init.c \
$(top_srcdir)/tools/bootstrap/external/lsf_query_native_int.c \ tools/bootstrap/external/lsf_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/lsf_query_node_list.c \ tools/bootstrap/external/lsf_query_node_list.c \
$(top_srcdir)/tools/bootstrap/external/lsf_env.c \ tools/bootstrap/external/lsf_env.c \
$(top_srcdir)/tools/bootstrap/external/sge_init.c \ tools/bootstrap/external/sge_init.c \
$(top_srcdir)/tools/bootstrap/external/sge_query_native_int.c \ tools/bootstrap/external/sge_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/sge_query_node_list.c \ tools/bootstrap/external/sge_query_node_list.c \
$(top_srcdir)/tools/bootstrap/external/sge_env.c \ tools/bootstrap/external/sge_env.c \
$(top_srcdir)/tools/bootstrap/external/pbs_init.c \ tools/bootstrap/external/pbs_init.c \
$(top_srcdir)/tools/bootstrap/external/pbs_query_native_int.c \ tools/bootstrap/external/pbs_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c \ tools/bootstrap/external/pbs_query_node_list.c \
$(top_srcdir)/tools/bootstrap/external/cobalt_init.c \ tools/bootstrap/external/cobalt_init.c \
$(top_srcdir)/tools/bootstrap/external/cobalt_query_native_int.c \ tools/bootstrap/external/cobalt_query_native_int.c \
$(top_srcdir)/tools/bootstrap/external/cobalt_query_node_list.c tools/bootstrap/external/cobalt_query_node_list.c
if hydra_pbs_launcher if hydra_pbs_launcher
libhydra_la_SOURCES += \ libhydra_la_SOURCES += \
$(top_srcdir)/tools/bootstrap/external/pbs_finalize.c \ tools/bootstrap/external/pbs_finalize.c \
$(top_srcdir)/tools/bootstrap/external/pbs_launch.c \ tools/bootstrap/external/pbs_launch.c \
$(top_srcdir)/tools/bootstrap/external/pbs_wait.c \ tools/bootstrap/external/pbs_wait.c \
$(top_srcdir)/tools/bootstrap/external/pbs_env.c tools/bootstrap/external/pbs_env.c
endif endif
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
bin_PROGRAMS += hydra_persist 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_CFLAGS = $(AM_CFLAGS)
hydra_persist_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_persist_LDFLAGS = $(external_ldflags) -L$(top_builddir)
hydra_persist_LDADD = -lhydra $(external_libs) hydra_persist_LDADD = -lhydra $(external_libs)
...@@ -17,6 +17,6 @@ noinst_HEADERS += \ ...@@ -17,6 +17,6 @@ noinst_HEADERS += \
tools/bootstrap/persist/persist_client.h \ tools/bootstrap/persist/persist_client.h \
tools/bootstrap/persist/persist_server.h tools/bootstrap/persist/persist_server.h
libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/persist/persist_init.c \ libhydra_la_SOURCES += tools/bootstrap/persist/persist_init.c \
$(top_srcdir)/tools/bootstrap/persist/persist_launch.c \ tools/bootstrap/persist/persist_launch.c \
$(top_srcdir)/tools/bootstrap/persist/persist_wait.c tools/bootstrap/persist/persist_wait.c
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_builddir)/tools/bootstrap/src/bsci_init.c \ libhydra_la_SOURCES += tools/bootstrap/src/bsci_init.c \
$(top_srcdir)/tools/bootstrap/src/bsci_finalize.c \ tools/bootstrap/src/bsci_finalize.c \
$(top_srcdir)/tools/bootstrap/src/bsci_launch.c \ tools/bootstrap/src/bsci_launch.c \
$(top_srcdir)/tools/bootstrap/src/bsci_query_node_list.c \ tools/bootstrap/src/bsci_query_node_list.c \
$(top_srcdir)/tools/bootstrap/src/bsci_query_proxy_id.c \ tools/bootstrap/src/bsci_query_proxy_id.c \
$(top_srcdir)/tools/bootstrap/src/bsci_query_native_int.c \ tools/bootstrap/src/bsci_query_native_int.c \
$(top_srcdir)/tools/bootstrap/src/bsci_wait.c \ tools/bootstrap/src/bsci_wait.c \
$(top_srcdir)/tools/bootstrap/src/bsci_env.c tools/bootstrap/src/bsci_env.c
...@@ -9,5 +9,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/bootstrap/utils ...@@ -9,5 +9,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/bootstrap/utils
noinst_HEADERS += tools/bootstrap/utils/bscu.h noinst_HEADERS += tools/bootstrap/utils/bscu.h
libhydra_la_SOURCES += \ libhydra_la_SOURCES += \
$(top_srcdir)/tools/bootstrap/utils/bscu_wait.c \ tools/bootstrap/utils/bscu_wait.c \
$(top_srcdir)/tools/bootstrap/utils/bscu_cb.c tools/bootstrap/utils/bscu_cb.c
...@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ckpoint ...@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ckpoint
noinst_HEADERS += tools/ckpoint/ckpoint.h 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 if hydra_have_blcr
include tools/ckpoint/blcr/Makefile.mk include tools/ckpoint/blcr/Makefile.mk
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
## See COPYRIGHT in top-level directory. ## 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 noinst_HEADERS += tools/ckpoint/blcr/ckpoint_blcr.h
...@@ -8,4 +8,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/debugger ...@@ -8,4 +8,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/debugger
noinst_HEADERS += tools/debugger/debugger.h noinst_HEADERS += tools/debugger/debugger.h
libhydra_la_SOURCES += $(top_srcdir)/tools/debugger/debugger.c libhydra_la_SOURCES += tools/debugger/debugger.c
...@@ -8,12 +8,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/demux ...@@ -8,12 +8,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/demux
noinst_HEADERS += tools/demux/demux.h tools/demux/demux_internal.h 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 if hydra_have_poll
libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_poll.c libhydra_la_SOURCES += tools/demux/demux_poll.c
endif endif
if hydra_have_select if hydra_have_select
libhydra_la_SOURCES += $(top_srcdir)/tools/demux/demux_select.c libhydra_la_SOURCES += tools/demux/demux_select.c
endif endif
...@@ -9,7 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ftb ...@@ -9,7 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/ftb
noinst_HEADERS += tools/ftb/hydt_ftb.h noinst_HEADERS += tools/ftb/hydt_ftb.h
if hydra_have_ftb if hydra_have_ftb
libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb.c libhydra_la_SOURCES += tools/ftb/hydt_ftb.c
else else
libhydra_la_SOURCES += $(top_srcdir)/tools/ftb/hydt_ftb_dummy.c libhydra_la_SOURCES += tools/ftb/hydt_ftb_dummy.c
endif endif
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
bin_PROGRAMS += hydra_nameserver 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_CFLAGS = $(AM_CFLAGS)
hydra_nameserver_LDFLAGS = $(external_ldflags) -L$(top_builddir) hydra_nameserver_LDFLAGS = $(external_ldflags)
hydra_nameserver_LDADD = -lhydra $(external_libs) hydra_nameserver_LDADD = -lhydra $(external_libs)
hydra_nameserver_DEPENDENCIES = libhydra.la hydra_nameserver_DEPENDENCIES = libhydra.la
...@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/topo ...@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tools/topo
noinst_HEADERS += tools/topo/topo.h 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 if hydra_have_hwloc
include tools/topo/hwloc/Makefile.mk include tools/topo/hwloc/Makefile.mk
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
## See COPYRIGHT in top-level directory. ## 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 noinst_HEADERS += tools/topo/hwloc/topo_hwloc.h
......
...@@ -10,7 +10,7 @@ noinst_HEADERS += ui/mpich/mpiexec.h ...@@ -10,7 +10,7 @@ noinst_HEADERS += ui/mpich/mpiexec.h
bin_PROGRAMS += mpiexec.hydra 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_LDFLAGS = $(external_ldflags) -L$(top_builddir)
mpiexec_hydra_LDADD = -lpm -lhydra $(external_libs) mpiexec_hydra_LDADD = -lpm -lhydra $(external_libs)
mpiexec_hydra_DEPENDENCIES = libpm.la libhydra.la mpiexec_hydra_DEPENDENCIES = libpm.la libhydra.la
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
## See COPYRIGHT in top-level directory. ## 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 noinst_HEADERS += ui/utils/uiu.h
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_srcdir)/utils/alloc/alloc.c libhydra_la_SOURCES += utils/alloc/alloc.c
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_srcdir)/utils/args/args.c libhydra_la_SOURCES += utils/args/args.c
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_srcdir)/utils/dbg/dbg.c libhydra_la_SOURCES += utils/dbg/dbg.c
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_srcdir)/utils/env/env.c libhydra_la_SOURCES += utils/env/env.c
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## See COPYRIGHT in top-level directory. ## See COPYRIGHT in top-level directory.
## ##
libhydra_la_SOURCES += $(top_srcdir)/utils/launch/launch.c libhydra_la_SOURCES += utils/launch/launch.c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment