[Python-checkins] CVS: python/dist/src/Tools/freeze freeze.py,1.38,1.39 makemakefile.py,1.4,1.5

[Neil Schemenauer]

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

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


Index: freeze.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/freeze/freeze.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** freeze.py	2001/03/20 20:43:33	1.38
--- freeze.py	2001/06/02 06:16:02	1.39
***************
*** 425,429 ****
      infp.close()
  
!     cflags = defines + includes + ['$(OPT)']
      libs = [os.path.join(binlib, 'libpython$(VERSION).a')]
  
--- 425,430 ----
      infp.close()
  
!     cflags = ['$(OPT)']
!     cppflags = defines + includes
      libs = [os.path.join(binlib, 'libpython$(VERSION).a')]
  
***************
*** 435,438 ****
--- 436,440 ----
  
      somevars['CFLAGS'] = string.join(cflags) # override
+     somevars['CPPFLAGS'] = string.join(cppflags) # override
      files = ['$(OPT)', '$(LDFLAGS)', base_config_c, base_frozen_c] + \
              files + supp_sources +  addfiles + libs + \

Index: makemakefile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/freeze/makemakefile.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** makemakefile.py	1998/06/12 14:09:34	1.4
--- makemakefile.py	2001/06/02 06:16:02	1.5
***************
*** 20,24 ****
              dest = base[:-2] + '.o'
              outfp.write("%s: %s\n" % (dest, file))
!             outfp.write("\t$(CC) $(CFLAGS) -c %s\n" % file)
              files[i] = dest
              deps.append(dest)
--- 20,24 ----
              dest = base[:-2] + '.o'
              outfp.write("%s: %s\n" % (dest, file))
!             outfp.write("\t$(CC) $(CFLAGS) $(CPPFLAGS) -c %s\n" % file)
              files[i] = dest
              deps.append(dest)