Skip to content

Commit 3f15501

Browse files
committed
oshmem: Do not install headers in case oshmem is off
1 parent 7cd3cae commit 3f15501

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

oshmem/include/Makefile.am

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013 Mellanox Technologies, Inc.
1+
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
22
# All rights reserved.
33
# $COPYRIGHT$
44
#
@@ -11,21 +11,20 @@
1111
headers = oshmem_config.h
1212
nodist_headers =
1313

14+
if PROJECT_OSHMEM
1415
# Install these in $(includedir)
1516
include_HEADERS =
1617

17-
# Install these in $(includedir)
18-
mppincludedir = $(includedir)/mpp
19-
mppinclude_HEADERS = mpp/shmem.h \
20-
mpp/shmem.fh
21-
2218
# Always install these in $(pkgincludedir)
2319
pkginclude_HEADERS =
2420

2521
include_HEADERS += shmem.fh \
2622
shmemx.h \
2723
shmem-compat.h
2824

25+
nobase_include_HEADERS = mpp/shmem.h \
26+
mpp/shmem.fh
27+
2928
# These files are always installed in $(includedir), but shouldn't be
3029
# shipped since they are generated by configure from their .in
3130
# counterparts (which AM automatically ships).
@@ -36,8 +35,10 @@ include_HEADERS += pshmem.h \
3635
pshmemx.h
3736
endif
3837

39-
nobase_dist_noinst_HEADERS = $(headers)
40-
nobase_nodist_noinst_HEADERS = $(nodist_headers)
38+
oshmemdir=${includedir}/openshmem
39+
nobase_dist_oshmem_HEADERS = $(headers)
40+
nobase_nodist_oshmem_HEADERS = $(nodist_headers)
41+
endif
4142

4243
distclean-local:
4344

0 commit comments

Comments
 (0)