[Python-checkins] CVS: python/dist/src/Misc Makefile.pre.in,1.20,1.21

Neil Schemenauer nascheme@users.sourceforge.net
Fri, 01 Jun 2001 23:16:04 -0700


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

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/Misc/Makefile.pre.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Makefile.pre.in	2001/01/23 01:53:41	1.20
--- Makefile.pre.in	2001/06/02 06:16:02	1.21
***************
*** 96,100 ****
  
  # Add more -I and -D options here
! CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
  
  # These two variables can be set in Setup to merge extensions.
--- 96,101 ----
  
  # Add more -I and -D options here
! CFLAGS=		$(OPT)
! CPPFLAGS=	-I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
  
  # These two variables can be set in Setup to merge extensions.
***************
*** 229,233 ****
  # Make config.o from the config.c created by makesetup
  config.o:	config.c
! 		$(CC) $(CFLAGS) -c config.c
  
  # Setup is copied from Setup.in *only* if it doesn't yet exist
--- 230,234 ----
  # Make config.o from the config.c created by makesetup
  config.o:	config.c
! 		$(CC) $(CFLAGS) $(CPPFLAGS) -c config.c
  
  # Setup is copied from Setup.in *only* if it doesn't yet exist