[Python-checkins] CVS: python/dist/src Makefile.in,1.107,1.108

[A.M. Kuchling]

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

Modified Files:
	Makefile.in 
Log Message:
Patch #102588 / PEP 229:
   The final piece of this change...

   Run setup.py to build shared modules and to install them.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** Makefile.in	2001/01/10 21:09:12	1.107
--- Makefile.in	2001/01/17 18:54:54	1.108
***************
*** 158,164 ****
  # Build the shared modules
  sharedmods: 	python$(EXE)
! 		cd Modules;  $(MAKE) OPT="$(OPT)" VERSION="$(VERSION)" \
! 			prefix="$(prefix)" exec_prefix="$(exec_prefix)" \
! 			sharedmods
  
  # Build the library
--- 158,166 ----
  # Build the shared modules
  sharedmods: 	python$(EXE)
! 		./python$(EXE) $(srcdir)/setup.py build
! # Old rules for building shared modules using makesetup
! #		cd Modules;  $(MAKE) OPT="$(OPT)" VERSION="$(VERSION)" \
! #			prefix="$(prefix)" exec_prefix="$(exec_prefix)" \
! #			sharedmods
  
  # Build the library
***************
*** 423,437 ****
  # This goes into $(exec_prefix)
  sharedinstall:
! 		cd Modules; $(MAKE) \
! 			OPT="$(OPT)" \
! 			VERSION="$(VERSION)" \
! 			SO="$(SO)" \
! 			LDSHARED="$(LDSHARED)" \
! 			CCSHARED="$(CCSHARED)" \
! 			LINKFORSHARED="$(LINKFORSHARED)" \
! 			DESTSHARED="$(DESTSHARED)" \
! 			prefix="$(prefix)" \
! 			exec_prefix="$(exec_prefix)" \
! 			sharedinstall
  
  # Build the sub-Makefiles
--- 425,441 ----
  # This goes into $(exec_prefix)
  sharedinstall:
! 		./python$(EXE) $(srcdir)/setup.py install
! # Old rules for installing shared modules built using makesetup
! #		cd Modules; $(MAKE) \
! #			OPT="$(OPT)" \
! #			VERSION="$(VERSION)" \
! #			SO="$(SO)" \
! #			LDSHARED="$(LDSHARED)" \
! #			CCSHARED="$(CCSHARED)" \
! #			LINKFORSHARED="$(LINKFORSHARED)" \
! #			DESTSHARED="$(DESTSHARED)" \
! #			prefix="$(prefix)" \
! #			exec_prefix="$(exec_prefix)" \
! #			sharedinstall
  
  # Build the sub-Makefiles
***************
*** 516,520 ****
  localclobber:	localclean
  		-rm -f tags TAGS python$(EXE) $(LIBRARY) $(LDLIBRARY) *.o
! 		-rm -f config.log config.cache config.h
  
  clobber:	localclobber
--- 520,525 ----
  localclobber:	localclean
  		-rm -f tags TAGS python$(EXE) $(LIBRARY) $(LDLIBRARY) *.o
! 		-rm -f config.log config.cache config.h 
! 		-rm -rf build
  
  clobber:	localclobber