summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-10-31 23:52:28 (GMT)
committerGitHub <noreply@github.com>2018-10-31 23:52:28 (GMT)
commit27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e (patch)
tree351096bf87da77ee8c4b08362e850e9affd18f8f /Makefile.pre.in
parent3a228ab17c2a9cffd1a2f15f30d6209768de20a6 (diff)
downloadcpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.zip
cpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.tar.gz
cpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.tar.bz2
bpo-35081: Add pycore_ prefix to internal header files (GH-10263)
* Rename Include/internal/ header files: * pyatomic.h -> pycore_atomic.h * ceval.h -> pycore_ceval.h * condvar.h -> pycore_condvar.h * context.h -> pycore_context.h * pygetopt.h -> pycore_getopt.h * gil.h -> pycore_gil.h * hamt.h -> pycore_hamt.h * hash.h -> pycore_hash.h * mem.h -> pycore_mem.h * pystate.h -> pycore_state.h * warnings.h -> pycore_warnings.h * PCbuild project, Makefile.pre.in, Modules/Setup: add the Include/internal/ directory to the search paths of header files. * Update includes. For example, replace #include "internal/mem.h" with #include "pycore_mem.h".
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 232025f..0336290 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -91,7 +91,7 @@ CONFIGURE_LDFLAGS= @LDFLAGS@
# command line to append to these values without stomping the pre-set
# values.
PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) -I$(srcdir)/Include/internal
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
# be able to build extension modules using the directories specified in the
# environment variables
@@ -1025,14 +1025,14 @@ PYTHON_HEADERS= \
pyconfig.h \
$(PARSER_HEADERS) \
$(srcdir)/Include/Python-ast.h \
- $(srcdir)/Include/internal/ceval.h \
- $(srcdir)/Include/internal/gil.h \
- $(srcdir)/Include/internal/mem.h \
- $(srcdir)/Include/internal/pyatomic.h \
- $(srcdir)/Include/internal/pygetopt.h \
- $(srcdir)/Include/internal/pystate.h \
- $(srcdir)/Include/internal/context.h \
- $(srcdir)/Include/internal/warnings.h \
+ $(srcdir)/Include/internal/pycore_atomic.h \
+ $(srcdir)/Include/internal/pycore_ceval.h \
+ $(srcdir)/Include/internal/pycore_context.h \
+ $(srcdir)/Include/internal/pycore_getopt.h \
+ $(srcdir)/Include/internal/pycore_gil.h \
+ $(srcdir)/Include/internal/pycore_mem.h \
+ $(srcdir)/Include/internal/pycore_state.h \
+ $(srcdir)/Include/internal/pycore_warnings.h \
$(DTRACE_HEADERS)
$(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)