[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.37,1.38

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv14048

Modified Files:
	Makefile.pre.in 
Log Message:
Separate CFLAGS and CPPFLAGS.  CFLAGS should not contain preprocessor
directives, which is the role of CPPFLAGS.  Closes SF patch #414991.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** Makefile.pre.in	2001/04/20 19:13:01	1.37
--- Makefile.pre.in	2001/06/02 06:16:02	1.38
***************
*** 56,60 ****
  OPT=		@OPT@
  DEFS=		@DEFS@
! CFLAGS=		$(OPT) -I. -I$(srcdir)/Include $(DEFS)
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
--- 56,61 ----
  OPT=		@OPT@
  DEFS=		@DEFS@
! CFLAGS=		$(OPT)
! CPPFLAGS=	-I. -I$(srcdir)/Include $(DEFS)
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
***************
*** 65,69 ****
  CFLAGSFORSHARED=@CFLAGSFORSHARED@
  # C flags used for building the interpreter object files
! PY_CFLAGS=	$(CFLAGS) $(CFLAGSFORSHARED)
  
  
--- 66,70 ----
  CFLAGSFORSHARED=@CFLAGSFORSHARED@
  # C flags used for building the interpreter object files
! PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
  
  
***************
*** 284,288 ****
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
--- 285,290 ----
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	unset PYTHONPATH PYTHONHOME PYTHONSTARTUP; \
! 		./$(PYTHON) $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
***************
*** 400,407 ****
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
  
  Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
--- 402,409 ----
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(CFLAGS) $(CPPFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
  
  Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c