diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-11-23 16:00:00 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 16:00:00 (GMT) |
commit | e421106b9e4d780c083113e4180d58d68acc69ab (patch) | |
tree | fe60b9c6e315443a68fae54c0b84f9eaca19949a /Makefile.pre.in | |
parent | b409ffa848b280c1db1b4f450bfae14f263099ac (diff) | |
download | cpython-e421106b9e4d780c083113e4180d58d68acc69ab.zip cpython-e421106b9e4d780c083113e4180d58d68acc69ab.tar.gz cpython-e421106b9e4d780c083113e4180d58d68acc69ab.tar.bz2 |
bpo-35134: Create Include/cpython/ subdirectory (GH-10624)
Include/*.h should be the "portable Python API", whereas
Include/cpython/*.h should be the "CPython API": CPython
implementation details.
Changes:
* Create Include/cpython/ subdirectory
* "make install" now creates $prefix/include/cpython and copy
Include/cpython/* to $prefix/include/cpython
* Create Include/cpython/objimpl.h: move objimpl.h code
surrounded by "#ifndef Py_LIMITED_API" to cpython/objimpl.h.
* objimpl.h now includes cpython/objimpl.h
* Windows installer (MSI) now also install Include/ subdirectories:
Include/cpython/ and Include/internal/.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r-- | Makefile.pre.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 5a21adb..d0e915a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1021,9 +1021,13 @@ PYTHON_HEADERS= \ $(srcdir)/Include/unicodeobject.h \ $(srcdir)/Include/warnings.h \ $(srcdir)/Include/weakrefobject.h \ + \ pyconfig.h \ $(PARSER_HEADERS) \ $(srcdir)/Include/Python-ast.h \ + \ + $(srcdir)/Include/cpython/objimpl.h \ + \ $(srcdir)/Include/internal/pycore_accu.h \ $(srcdir)/Include/internal/pycore_atomic.h \ $(srcdir)/Include/internal/pycore_ceval.h \ @@ -1446,6 +1450,11 @@ inclinstall: else true; \ fi; \ done + @if test ! -d $(DESTDIR)$(INCLUDEPY)/cpython; then \ + echo "Creating directory $(DESTDIR)$(INCLUDEPY)/cpython"; \ + $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/cpython; \ + else true; \ + fi @if test ! -d $(DESTDIR)$(INCLUDEPY)/internal; then \ echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal"; \ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \ @@ -1456,6 +1465,11 @@ inclinstall: echo $(INSTALL_DATA) $$i $(INCLUDEPY); \ $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \ done + @for i in $(srcdir)/Include/cpython/*.h; \ + do \ + echo $(INSTALL_DATA) $$i $(INCLUDEPY)/cpython; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/cpython; \ + done @for i in $(srcdir)/Include/internal/*.h; \ do \ echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \ |