Skip to content

Commit f5383da

Browse files
author
Ralph Castain
authored
Merge pull request #6202 from rhc54/topic/ext3x
Fix external PMIx v3 support
2 parents c79eb1d + ece7696 commit f5383da

File tree

2 files changed

+185
-194
lines changed

2 files changed

+185
-194
lines changed

opal/mca/pmix/ext3x/Makefile.am

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
dist_opaldata_DATA = help-pmix-ext3x.txt
1515

1616
sources = \
17-
ext3x_local.c
18-
19-
headers = \
20-
ext3x.h
21-
22-
nodist_sources = \
17+
ext3x.h \
2318
ext3x.c \
19+
ext3x_local.c \
2420
ext3x_client.c \
2521
ext3x_component.c \
2622
ext3x_server_north.c \
@@ -40,21 +36,16 @@ endif
4036

4137
mcacomponentdir = $(opallibdir)
4238
mcacomponent_LTLIBRARIES = $(component_install)
43-
mca_pmix_ext3x_la_SOURCES = $(sources) $(headers)
44-
nodist_mca_pmix_ext3x_la_SOURCES = $(nodist_sources)
39+
mca_pmix_ext3x_la_SOURCES = $(sources)
4540
mca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
4641
mca_pmix_ext3x_la_CPPFLAGS =$(opal_pmix_ext3x_CPPFLAGS)
4742
mca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
4843
mca_pmix_ext3x_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
4944
$(opal_pmix_ext3x_LIBS)
5045

5146
noinst_LTLIBRARIES = $(component_noinst)
52-
libmca_pmix_ext3x_la_SOURCES =$(sources) $(headers)
53-
nodist_libmca_pmix_ext3x_la_SOURCES = $(nodist_sources)
47+
libmca_pmix_ext3x_la_SOURCES =$(sources)
5448
libmca_pmix_ext3x_la_CFLAGS = $(opal_pmix_ext3x_CFLAGS)
5549
libmca_pmix_ext3x_la_CPPFLAGS = $(opal_pmix_ext3x_CPPFLAGS)
5650
libmca_pmix_ext3x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext3x_LDFLAGS)
5751
libmca_pmix_ext3x_la_LIBADD = $(opal_pmix_ext3x_LIBS)
58-
59-
clean-local:
60-
$(RM) -f $(nodist_sources)

0 commit comments

Comments
 (0)