Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
darshan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
76
Issues
76
List
Boards
Labels
Milestones
Merge Requests
14
Merge Requests
14
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
darshan
darshan
Commits
538812e4
Commit
538812e4
authored
Jun 17, 2016
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup makefile & autoconf mmap detection
parent
936d1e10
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
darshan-runtime/Makefile.in
darshan-runtime/Makefile.in
+5
-2
darshan-runtime/configure
darshan-runtime/configure
+7
-2
darshan-runtime/configure.in
darshan-runtime/configure.in
+3
-1
No files found.
darshan-runtime/Makefile.in
View file @
538812e4
...
...
@@ -18,6 +18,7 @@ CC = @CC@
LD
=
@LD@
DISABLE_LDPRELOAD
=
@DISABLE_LDPRELOAD@
ENABLE_MMAP_LOGS
=
@ENABLE_MMAP_LOGS@
DARSHAN_USE_BGQ
=
@DARSHAN_USE_BGQ@
DARSHAN_LOG_FORMAT
=
$(srcdir)
/../darshan-log-format.h
DARSHAN_VERSION
=
@DARSHAN_VERSION@
...
...
@@ -154,12 +155,14 @@ endif
install
-m
755 share/mpi-profile/darshan-bg-cc.conf
$(datarootdir)
/mpi-profile/darshan-bg-cc.conf
install
-m
755 share/mpi-profile/darshan-bg-cxx.conf
$(datarootdir)
/mpi-profile/darshan-bg-cxx.conf
install
-m
755 share/mpi-profile/darshan-bg-f.conf
$(datarootdir)
/mpi-profile/darshan-bg-f.conf
install
-m
755 share/darshan-mmap-epilog.sh
$(datarootdir)
/darshan-mmap-epilog.sh
install
-d
$(datarootdir)
/ld-opts
install
-m
644 share/ld-opts/darshan-base-ld-opts
$(datarootdir)
/ld-opts/darshan-base-ld-opts
install
-m
644
$(srcdir)
/share/ld-opts/darshan-posix-ld-opts
$(datarootdir)
/ld-opts/darshan-posix-ld-opts
install
-m
644
$(srcdir)
/share/ld-opts/darshan-hdf5-ld-opts
$(datarootdir)
/ld-opts/darshan-hdf5-ld-opts
install
-m
644
$(srcdir)
/share/ld-opts/darshan-pnetcdf-ld-opts
$(datarootdir)
/ld-opts/darshan-pnetcdf-ld-opts
ifdef
ENABLE_MMAP_LOGS
install
-m
755 share/darshan-mmap-epilog.sh
$(datarootdir)
/darshan-mmap-epilog.sh
endif
install
-d
$(libdir)
/pkgconfig
install
-m
644 lib/pkgconfig/darshan-runtime.pc
$(libdir)
/pkgconfig/darshan-runtime.pc
...
...
@@ -167,5 +170,5 @@ clean::
rm
-f
*
.o
*
.a lib/
*
.o lib/
*
.po lib/
*
.a lib/
*
.so
distclean
::
clean
rm
-f
darshan-runtime-config.h darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-gen-cc.pl darshan-mk-log-dirs.pl darshan-config
darshan-base-ld-opts
aclocal.m4 autom4te.cache/
*
config.status config.log Makefile
rm
-f
darshan-runtime-config.h darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-gen-cc.pl darshan-mk-log-dirs.pl darshan-config
lib/pkgconfig/darshan-runtime.pc share/craype-1.x/darshan-module share/craype-2.x/darshan-module share/darshan-mmap-epilog.sh share/ld-opts/darshan-base-ld-opts share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf
aclocal.m4 autom4te.cache/
*
config.status config.log Makefile
rm
-rf
autom4te.cache
darshan-runtime/configure
View file @
538812e4
...
...
@@ -624,6 +624,7 @@ LIBOBJS
DARSHAN_USE_BGQ
MPICH_LIB_OLD
DARSHAN_VERSION
ENABLE_MMAP_LOGS
DISABLE_LDPRELOAD
__DARSHAN_LOG_PATH
darshan_share_path
...
...
@@ -3580,6 +3581,9 @@ if test "${enable_mmap_logs+set}" = set; then :
$as_echo
"#define __DARSHAN_ENABLE_MMAP_LOGS 1"
>>
confdefs.h
ENABLE_MMAP_LOGS
=
1
ac_config_files
=
"
$ac_config_files
share/darshan-mmap-epilog.sh"
fi
fi
...
...
@@ -4326,7 +4330,8 @@ DARSHAN_VERSION="3.0.1"
ac_config_files
=
"
$ac_config_files
Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/ld-opts/darshan-base-ld-opts share/darshan-mmap-epilog.sh"
ac_config_files
=
"
$ac_config_files
Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/ld-opts/darshan-base-ld-opts"
cat
>
confcache
<<
\
_ACEOF
# This file is a shell script that caches the results of configure
...
...
@@ -5020,6 +5025,7 @@ for ac_config_target in $ac_config_targets
do
case
$ac_config_target
in
"darshan-runtime-config.h") CONFIG_HEADERS="
$CONFIG_HEADERS
darshan-runtime-config.h" ;;
"share/darshan-mmap-epilog.sh") CONFIG_FILES="
$CONFIG_FILES
share/darshan-mmap-epilog.sh" ;;
"Makefile") CONFIG_FILES="
$CONFIG_FILES
Makefile" ;;
"darshan-mk-log-dirs.pl") CONFIG_FILES="
$CONFIG_FILES
darshan-mk-log-dirs.pl" ;;
"darshan-gen-cc.pl") CONFIG_FILES="
$CONFIG_FILES
darshan-gen-cc.pl" ;;
...
...
@@ -5036,7 +5042,6 @@ do
"share/mpi-profile/darshan-bg-cxx.conf") CONFIG_FILES="
$CONFIG_FILES
share/mpi-profile/darshan-bg-cxx.conf" ;;
"share/mpi-profile/darshan-bg-f.conf") CONFIG_FILES="
$CONFIG_FILES
share/mpi-profile/darshan-bg-f.conf" ;;
"share/ld-opts/darshan-base-ld-opts") CONFIG_FILES="
$CONFIG_FILES
share/ld-opts/darshan-base-ld-opts" ;;
"share/darshan-mmap-epilog.sh") CONFIG_FILES="
$CONFIG_FILES
share/darshan-mmap-epilog.sh" ;;
*) as_fn_error
$?
"invalid argument:
\`
$ac_config_target
'" "
$LINENO
" 5;;
esac
...
...
darshan-runtime/configure.in
View file @
538812e4
...
...
@@ -57,6 +57,8 @@ AC_ARG_ENABLE(mmap-logs,
[ --enable-mmmap-logs Enables ability to mmap I/O data to log file],
[if test "x$enableval" = "xyes" ; then
AC_DEFINE(__DARSHAN_ENABLE_MMAP_LOGS, 1, Define if Darshan should mmap data structures to log file)
ENABLE_MMAP_LOGS=1
AC_CONFIG_FILES(share/darshan-mmap-epilog.sh)
fi]
,)
...
...
@@ -328,6 +330,7 @@ AC_SUBST(darshan_share_path)
AC_SUBST(LDFLAGS)
AC_SUBST(__DARSHAN_LOG_PATH)
AC_SUBST(DISABLE_LDPRELOAD)
AC_SUBST(ENABLE_MMAP_LOGS)
AC_SUBST(DARSHAN_VERSION)
AC_SUBST(MPICH_LIB_OLD)
AC_SUBST(DARSHAN_USE_BGQ)
...
...
@@ -347,5 +350,4 @@ share/mpi-profile/darshan-bg-cc.conf
share/mpi-profile/darshan-bg-cxx.conf
share/mpi-profile/darshan-bg-f.conf
share/ld-opts/darshan-base-ld-opts
share/darshan-mmap-epilog.sh
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment