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

[Neil Schemenauer]

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

Modified Files:
	Makefile.pre.in 
Log Message:
- Add CFLAGSFORSHARED variable.  configure sets this to CCSHARED if LDLIBRARY
  is a shared library.
- Add PY_CFLAGS variable (flags used to compile the interpreter)
- clobber now just removes object files, libraries and binaries


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.pre.in	2001/01/25 20:07:50	1.3
--- Makefile.pre.in	2001/01/26 16:14:41	1.4
***************
*** 72,75 ****
--- 72,82 ----
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
+ CCSHARED=	@CCSHARED@
+ LINKFORSHARED=	@LINKFORSHARED@
+ # Extra C flags added for building the interpreter object files.
+ CFLAGSFORSHARED=@CFLAGSFORSHARED@
+ # C flags used for building the interpreter object files
+ PY_CFLAGS=	$(CFLAGS) $(CFLAGSFORSHARED)
+ 
  
  # Machine-dependent subdirectories
***************
*** 100,105 ****
  SO=		@SO@
  LDSHARED=	@LDSHARED@
- CCSHARED=	@CCSHARED@
- LINKFORSHARED=	@LINKFORSHARED@
  DESTSHARED=	$(BINLIBDEST)/lib-dynload
  
--- 107,110 ----
***************
*** 132,136 ****
  
  
! LIBRARY=	libpython$(VERSION).a
  LDLIBRARY=      @LDLIBRARY@
  DLLLIBRARY=	@DLLLIBRARY@
--- 137,141 ----
  
  
! LIBRARY=	@LIBRARY@
  LDLIBRARY=      @LDLIBRARY@
  DLLLIBRARY=	@DLLLIBRARY@
***************
*** 357,366 ****
  		echo "need in your Modules/Setup file."; \
  		echo "-----------------------------------------------"; \
! 	else cp $(srcdir)/Modules/Setup.dist Modules/Setup; fi
! 
! 
! Modules/Setup.local:
! 	@echo "# Edit this file for local setup changes" >Modules/Setup.local
! 
  
  ############################################################################
--- 362,366 ----
  		echo "need in your Modules/Setup file."; \
  		echo "-----------------------------------------------"; \
! 	fi
  
  ############################################################################
***************
*** 368,385 ****
  
  Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
! 	$(CC) -c $(CFLAGS) -DBUILD=`cat buildno` \
! 		$(srcdir)/Modules/getbuildinfo.c \
! 		-o Modules/getbuildinfo.o
  	
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
! 	$(CC) -c $(CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
! 	-DPREFIX='"$(prefix)"' \
! 	-DEXEC_PREFIX='"$(exec_prefix)"' \
! 	-DVERSION='"$(VERSION)"' \
! 	-DVPATH='"$(VPATH)"' \
! 	$(srcdir)/Modules/getpath.c -o $@
  
  Modules/ccpython.o: Modules/ccpython.cc
! 	$(CXX) $(CFLAGS) -c $< -o $@
  
  
--- 368,383 ----
  
  Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
! 	$(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $<
  	
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
! 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
! 		-DPREFIX='"$(prefix)"' \
! 		-DEXEC_PREFIX='"$(exec_prefix)"' \
! 		-DVERSION='"$(VERSION)"' \
! 		-DVPATH='"$(VPATH)"' \
! 		-o $@ $<
  
  Modules/ccpython.o: Modules/ccpython.cc
! 	$(CXX) -c $(PY_CFLAGS) -o $@ $<
  
  
***************
*** 400,409 ****
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(CFLAGS) -DPLATFORM='"$(MACHDEP)"' \
! 			-o Python/getplatform.o $(srcdir)/Python/getplatform.c
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(CFLAGS) -I$(DLINCLDIR) \
! 			-o Python/importdl.o $(srcdir)/Python/importdl.c
  
  
--- 398,405 ----
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $<
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(CFLAGS) -I$(DLINCLDIR) -o $@ $<
  
  
***************
*** 718,722 ****
  # Some make's put the object file in the current directory
  .c.o:
! 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
  
  # Rerun configure with the same options as it was run last time,
--- 714,718 ----
  # Some make's put the object file in the current directory
  .c.o:
! 	$(CC) -c $(PY_CFLAGS) -o $@ $<
  
  # Rerun configure with the same options as it was run last time,
***************
*** 759,774 ****
  
  clobber: clean
! 	-rm -f tags TAGS $(PYTHON) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY)
! 	-rm -f Makefile.pre config.log config.cache config.h setup.cfg
! 	-rm -f Modules/*.so Modules/*.sl
  
  # Make things extra clean, before making a distribution:
  # remove all generated files, even Makefile[.pre]
  distclean: clobber
! 	-$(MAKE) -f $(srcdir)/Makefile.pre.in \
! 		SUBDIRS="$(SUBDIRSTOO)" clobber
! 	-rm -f config.status config.log config.cache config.h Makefile
! 	-rm -f buildno Modules/Setup Modules/Setup.local Modules/Setup.config
! 	-rm -f Modules/config.c
  	-for i in $(SUBDIRSTOO); do \
  		 for f in $$i/*.in; do \
--- 755,767 ----
  
  clobber: clean
! 	-rm -f tags TAGS $(PYTHON) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
! 		Modules/*.so Modules/*.sl
  
  # Make things extra clean, before making a distribution:
  # remove all generated files, even Makefile[.pre]
  distclean: clobber
! 	-rm -f Makefile Makefile.pre buildno config.status config.log \
! 		config.cache config.h setup.cfg Modules/config.c \
! 		Modules/Setup Modules/Setup.local Modules/Setup.config
  	-for i in $(SUBDIRSTOO); do \
  		 for f in $$i/*.in; do \