Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libmtime
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
icon-libraries
libmtime
Commits
65933898
Commit
65933898
authored
8 months ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
More portable installation for the Python interface
parent
d6ad7199
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!40
Fix Python interface
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Makefile.am
+7
-2
7 additions, 2 deletions
src/Makefile.am
src/Makefile.in
+65
-14
65 additions, 14 deletions
src/Makefile.in
with
72 additions
and
16 deletions
src/Makefile.am
+
7
−
2
View file @
65933898
...
...
@@ -141,11 +141,16 @@ mostlyclean-local:
if
ENABLE_PYTHON
python_mtimedir
=
$(
pythondir
)
/mtime
install_tmpdir
=
mtime/.install
python_mtime_PYTHON
=
mtime/libmtime.py mtime/__init__.py
python_mtime_PYTHON
=
mtime/__init__.py
nodist_python_mtime_PYTHON
=
$(
install_tmpdir
)
/libmtime.py
$(install_tmpdir)/libmtime.py
:
mtime/libmtime.py
$(
MKDIR_P
)
$(
@D
)
&&
sed
"s,^SOFILE = None
$$
,SOFILE = '
$(
DESTDIR
)$(
libdir
)
/libmtime
$(
acx_shrext
)
',"
$<
>
$@
install-data-hook
:
sed
-i
"s,^SOFILE = None
$$
,SOFILE = '
$(
libdir
)
/libmtime
$(
acx_shrext
)
',"
$(
DESTDIR
)$(
python_mtimedir
)
/libmtime.py
rm
-rf
$(
install_tmpdir
)
endif
ENABLE_PYTHON
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.in
+
65
−
14
View file @
65933898
...
...
@@ -146,7 +146,7 @@ am__uninstall_files_from_dir = { \
$(
am__cd
)
"
$$
dir"
&&
rm
-f
$$
files
;
}
;
\
}
am__installdirs
=
"
$(
DESTDIR
)$(
libdir
)
"
"
$(
DESTDIR
)$(
python_mtimedir
)
"
\
"
$(
DESTDIR
)$(
includedir
)
"
"
$(
DESTDIR
)$(
python_mtimedir
)
"
"
$(
DESTDIR
)$(
includedir
)
"
LTLIBRARIES
=
$(
lib_LTLIBRARIES
)
libmtime_la_LIBADD
=
am__libmtime_la_SOURCES_DIST
=
kepler.c libmtime.f90
\
...
...
@@ -241,10 +241,10 @@ am__can_run_installinfo = \
n|no|NO
)
false
;;
\
*
)
(
install-info
--version
)
>
/dev/null 2>&1
;;
\
esac
am__python_mtime_PYTHON_DIST
=
mtime/libmtime.py mtime/__init__.py
am__py_compile
=
PYTHON
=
$(
PYTHON
)
$(
SHELL
)
$(
py_compile
)
am__pep3147_tweak
=
\
sed
-e
's|\.py$$||'
-e
's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|'
am__python_mtime_PYTHON_DIST
=
mtime/__init__.py
py_compile
=
$(
top_srcdir
)
/config/py-compile
HEADERS
=
$(
nodist_include_HEADERS
)
am__extra_recursive_targets
=
doc-recursive install-doc-recursive
\
...
...
@@ -488,7 +488,9 @@ all_mods = $(mtime_c_bindings_mod) $(mtime_constants_mod) \
nodist_include_HEADERS
=
$(
all_mods
)
MOSTLYCLEANFILES
=
$(
all_mods
)
@ENABLE_PYTHON_TRUE@
python_mtimedir
=
$(
pythondir
)
/mtime
@ENABLE_PYTHON_TRUE@
python_mtime_PYTHON
=
mtime/libmtime.py mtime/__init__.py
@ENABLE_PYTHON_TRUE@
install_tmpdir
=
mtime/.install
@ENABLE_PYTHON_TRUE@
python_mtime_PYTHON
=
mtime/__init__.py
@ENABLE_PYTHON_TRUE@
nodist_python_mtime_PYTHON
=
$(
install_tmpdir
)
/libmtime.py
EXTRA_DIST
=
mtime_iso8601.rl
all
:
all-am
...
...
@@ -626,6 +628,49 @@ mostlyclean-libtool:
clean-libtool
:
-
rm
-rf
.libs _libs
install-nodist_python_mtimePYTHON
:
$(nodist_python_mtime_PYTHON)
@$(
NORMAL_INSTALL
)
@
list
=
'
$(
nodist_python_mtime_PYTHON
)
'
;
dlist
=
;
list2
=
;
test
-n
"
$(
python_mtimedir
)
"
||
list
=
;
\
if
test
-n
"
$$
list"
;
then
\
echo
"
$(
MKDIR_P
)
'
$(
DESTDIR
)$(
python_mtimedir
)
'"
;
\
$(
MKDIR_P
)
"
$(
DESTDIR
)$(
python_mtimedir
)
"
||
exit
1
;
\
fi
;
\
for
p
in
$$
list
;
do
\
if
test
-f
"
$$
p"
;
then
b
=
;
else
b
=
"
$(
srcdir
)
/"
;
fi
;
\
if
test
-f
$$
b
$$
p
;
then
\
$(
am__strip_dir
)
\
dlist
=
"
$$
dlist
$$
f"
;
\
list2
=
"
$$
list2
$$
b
$$
p"
;
\
else
:
;
fi
;
\
done
;
\
for
file
in
$$
list2
;
do
echo
$$
file
;
done
|
$(
am__base_list
)
|
\
while
read
files
;
do
\
echo
"
$(
INSTALL_DATA
)
$$
files '
$(
DESTDIR
)$(
python_mtimedir
)
'"
;
\
$(
INSTALL_DATA
)
$$
files
"
$(
DESTDIR
)$(
python_mtimedir
)
"
||
exit
$$
?
;
\
done
||
exit
$$
?
;
\
if
test
-n
"
$$
dlist"
;
then
\
$(
am__py_compile
)
--destdir
"
$(
DESTDIR
)
"
\
--basedir
"
$(
python_mtimedir
)
"
$$
dlist
;
\
else
:
;
fi
uninstall-nodist_python_mtimePYTHON
:
@$(
NORMAL_UNINSTALL
)
@
list
=
'
$(
nodist_python_mtime_PYTHON
)
'
;
test
-n
"
$(
python_mtimedir
)
"
||
list
=
;
\
py_files
=
`
for
p
in
$$
list
;
do
echo
$$
p
;
done
|
sed
-e
's|^.*/||'
`
;
\
test
-n
"
$$
py_files"
||
exit
0
;
\
dir
=
'
$(
DESTDIR
)$(
python_mtimedir
)
'
;
\
pyc_files
=
`
echo
"
$$
py_files"
|
sed
's|$$|c|'
`
;
\
pyo_files
=
`
echo
"
$$
py_files"
|
sed
's|$$|o|'
`
;
\
st
=
0
;
\
for
files
in
"
$$
py_files"
"
$$
pyc_files"
"
$$
pyo_files"
;
do
\
$(
am__uninstall_files_from_dir
)
||
st
=
$$
?
;
\
done
;
\
dir
=
'
$(
DESTDIR
)$(
python_mtimedir
)
'
;
\
echo
"
$$
py_files"
|
$(
am__pep3147_tweak
)
|
$(
am__base_list
)
|
\
while
read
files
;
do
\
$(
am__uninstall_files_from_dir
)
||
st
=
$$
?
;
\
done
||
exit
$$
?
;
\
exit
$$
st
install-python_mtimePYTHON
:
$(python_mtime_PYTHON)
@$(
NORMAL_INSTALL
)
@
list
=
'
$(
python_mtime_PYTHON
)
'
;
dlist
=
;
list2
=
;
test
-n
"
$(
python_mtimedir
)
"
||
list
=
;
\
...
...
@@ -783,7 +828,7 @@ check-am: all-am
check
:
check-am
all-am
:
Makefile $(LTLIBRARIES) $(HEADERS)
installdirs
:
for
dir
in
"
$(
DESTDIR
)$(
libdir
)
"
"
$(
DESTDIR
)$(
python_mtimedir
)
"
"
$(
DESTDIR
)$(
includedir
)
"
;
do
\
for
dir
in
"
$(
DESTDIR
)$(
libdir
)
"
"
$(
DESTDIR
)$(
python_mtimedir
)
"
"
$(
DESTDIR
)$(
python_mtimedir
)
"
"
$(
DESTDIR
)$(
includedir
)
"
;
do
\
test
-z
"
$$
dir"
||
$(
MKDIR_P
)
"
$$
dir"
;
\
done
install
:
install-am
...
...
@@ -861,7 +906,7 @@ info: info-am
info-am
:
install-data-am
:
install-nodist_includeHEADERS
\
install-python_mtimePYTHON
install-nodist_python_mtimePYTHON
install-python_mtimePYTHON
@$(
NORMAL_INSTALL
)
$(
MAKE
)
$(
AM_MAKEFLAGS
)
install-data-hook
install-doc
:
install-doc-am
...
...
@@ -934,6 +979,7 @@ ps: ps-am
ps-am
:
uninstall-am
:
uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
\
uninstall-nodist_python_mtimePYTHON
\
uninstall-python_mtimePYTHON
.MAKE
:
install-am install-data-am install-strip
...
...
@@ -948,14 +994,16 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS \
install-exec-am install-html install-html-am install-info
\
install-info-am install-libLTLIBRARIES install-man
\
install-man-am install-man-local install-nodist_includeHEADERS
\
install-pdf install-pdf-am install-ps install-ps-am
\
install-python_mtimePYTHON install-strip installcheck
\
installcheck-am installdirs maintainer-clean
\
maintainer-clean-generic man-am man-local mostlyclean
\
mostlyclean-compile mostlyclean-generic mostlyclean-libtool
\
mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall
\
uninstall-am uninstall-libLTLIBRARIES
\
uninstall-nodist_includeHEADERS uninstall-python_mtimePYTHON
install-nodist_python_mtimePYTHON install-pdf install-pdf-am
\
install-ps install-ps-am install-python_mtimePYTHON
\
install-strip installcheck installcheck-am installdirs
\
maintainer-clean maintainer-clean-generic man-am man-local
\
mostlyclean mostlyclean-compile mostlyclean-generic
\
mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags
\
tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
\
uninstall-nodist_includeHEADERS
\
uninstall-nodist_python_mtimePYTHON
\
uninstall-python_mtimePYTHON
.PRECIOUS
:
Makefile
...
...
@@ -999,8 +1047,11 @@ mtime_iso8601.c: @MAINTAINER_MODE_TRUE@ mtime_iso8601.rl
mostlyclean-local
:
rm
-f
*
.i
@ENABLE_PYTHON_TRUE@$(install_tmpdir)/libmtime.py
:
mtime/libmtime.py
@ENABLE_PYTHON_TRUE@
$(MKDIR_P)
$(@D)
&&
sed
"s,^SOFILE = None$$,SOFILE = '$(DESTDIR)$(libdir)/libmtime$(acx_shrext)',"
$<
>$@
@ENABLE_PYTHON_TRUE@install-data-hook
:
@ENABLE_PYTHON_TRUE@
sed
-i
"s,^SOFILE = None$$,SOFILE = '$(libdir)/libmtime$(acx_shrext)',"
$(DESTDIR)$(python_mtimedir)/libmtime.py
@ENABLE_PYTHON_TRUE@
rm
-rf
$(install_tmpdir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment