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

[Neil Schemenauer]

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

Modified Files:
	Makefile.pre.in 
Log Message:
- Fix buildno dependencies (I hope).
- Change one last EXE to EXEEXT.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.pre.in	2001/01/26 22:52:45	1.5
--- Makefile.pre.in	2001/01/27 21:42:38	1.6
***************
*** 162,167 ****
  		Modules/config.o \
  		Modules/getpath.o \
! 		Modules/main.o \
! 		Modules/getbuildinfo.o
  
  # Used of signalmodule.o is not available
--- 162,166 ----
  		Modules/config.o \
  		Modules/getpath.o \
! 		Modules/main.o
  
  # Used of signalmodule.o is not available
***************
*** 269,272 ****
--- 268,272 ----
  # objects that get linked into the Python library
  LIBRARY_OBJS=	\
+ 		Modules/getbuildinfo.o \
  		$(PARSER_OBJS) \
  		$(OBJECT_OBJS) \
***************
*** 276,280 ****
  		$(MODOBJS)
  
- 
  #########################################################################
  # Rules
--- 276,279 ----
***************
*** 285,296 ****
  # Build the interpreter
  $(PYTHON):	$(MAINOBJ) $(LDLIBRARY)
- 		expr `cat buildno` + 1 >buildno1
- 		mv -f buildno1 buildno
  		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ $(MAINOBJ) \
  			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
- buildno:
- 	echo 1 >buildno
- 
  platform: $(PYTHON)
  	./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
--- 284,290 ----
***************
*** 301,308 ****
--- 295,316 ----
  	./$(PYTHON) $(srcdir)/setup.py build
  
+ # buildno should really depend on something like LIBRARY_SRC
+ buildno: $(PARSER_OBJS) \
+ 		$(OBJECT_OBJS) \
+ 		$(PYTHON_OBJS) \
+ 		$(MODULE_OBJS) \
+ 		$(SIGNAL_OBJS) \
+ 		$(MODOBJS) \
+ 		$(srcdir)/Modules/getbuildinfo.c
+ 	if test -f buildno; then \
+ 		expr `cat buildno` + 1 >buildno1; \
+ 		mv -f buildno1 buildno; \
+ 	else echo 1 >buildno; fi
+ 
  # Build static library
  $(LIBRARY): $(LIBRARY_OBJS)
  	-rm -f $@
  	# avoid long command lines, same as LIBRARY_OBJS
+ 	$(AR) cr $@ Modules/getbuildinfo.o
  	$(AR) cr $@ $(PARSER_OBJS)
  	$(AR) cr $@ $(OBJECT_OBJS)
***************
*** 685,689 ****
  # This goes into $(exec_prefix)
  sharedinstall:
! 	./python$(EXE) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)
  
--- 693,697 ----
  # This goes into $(exec_prefix)
  sharedinstall:
! 	./python$(EXEEXT) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)