Skip to content

Commit 2a98f9f

Browse files
committed
oshmem: replace header files in include/mpp with symlinks
This is a work around to avoit what looks like a CMake bug Thanks Paul Kapinos for the report Fixes #1868
1 parent c3c262b commit 2a98f9f

File tree

3 files changed

+11
-29
lines changed

3 files changed

+11
-29
lines changed

oshmem/include/Makefile.am

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
22
# All rights reserved.
3+
# Copyright (c) 2016 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
35
# $COPYRIGHT$
46
#
57
# Additional copyrights may follow
@@ -22,9 +24,16 @@ include_HEADERS += shmem.fh \
2224
shmemx.h \
2325
shmem-compat.h
2426

25-
nobase_include_HEADERS = mpp/shmem.h \
26-
mpp/shmem.fh
27+
# Create symlinks for the (now deprecated) files in $(includedir)/mpp directory
28+
install-exec-hook:
29+
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)/mpp"
30+
(cd $(DESTDIR)$(includedir)/mpp; rm -f shmem.h; $(LN_S) ../shmem.h shmem.h)
31+
(cd $(DESTDIR)$(includedir)/mpp; rm -f shmem.fh; $(LN_S) ../shmem.fh shmem.fh)
2732

33+
uninstall-local:
34+
rm -f $(DESTDIR)/$(includedir)/mpp/shmem.h \
35+
$(DESTDIR)/$(includedir)/mpp/shmem.fh
36+
2837
# These files are always installed in $(includedir), but shouldn't be
2938
# shipped since they are generated by configure from their .in
3039
# counterparts (which AM automatically ships).

oshmem/include/mpp/shmem.fh

Lines changed: 0 additions & 11 deletions
This file was deleted.

oshmem/include/mpp/shmem.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)