[Python-checkins] CVS: python/dist/src/Modules makesetup,1.31,1.32

[Neil Schemenauer]

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

Modified Files:
	makesetup 
Log Message:
Changes for flat makefile.  Building of modules happens from toplevel
directory.  Modify meaning of -s option to specify the Modules directory.
Add -l option to specify library source directory when building extension
modules.  Perhaps these names should be switched to avoid breaking old
code.  Add -c compiler option to when emitting rules to build object files.


Index: makesetup
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/makesetup,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** makesetup	2001/01/10 21:46:05	1.31
--- makesetup	2001/01/24 17:16:22	1.32
***************
*** 7,12 ****
  #
  # Options:
! # -s directory: alternative source directory (default derived from $0)
! # -c file:      alternative config.c template (default $srcdir/config.c.in)
  # -c -:         don't write config.c
  # -m file:      alternative Makefile template (default ./Makefile.pre)
--- 7,13 ----
  #
  # Options:
! # -s directory: alternative source directory (default .)
! # -l directory: library source directory (default derived from $0)
! # -c file:      alternative config.c template (default $libdir/config.c.in)
  # -c -:         don't write config.c
  # -m file:      alternative Makefile template (default ./Makefile.pre)
***************
*** 41,47 ****
  # Loop over command line options
  usage='
! usage: makesetup [-s srcdir] [-c config.c.in] [-m Makefile.pre]
                   [Setup] ... [-n [Setup] ...]'
! srcdir=''
  config=''
  makepre=''
--- 42,49 ----
  # Loop over command line options
  usage='
! usage: makesetup [-s srcdir] [-l libdir] [-c config.c.in] [-m Makefile.pre]
                   [Setup] ... [-n [Setup] ...]'
! srcdir='.'
! libdir=''
  config=''
  makepre=''
***************
*** 52,55 ****
--- 54,58 ----
  	case $1 in
  	-s)	shift; srcdir=$1; shift;;
+ 	-l)	shift; libdir=$1; shift;;
  	-c)	shift; config=$1; shift;;
  	-m)	shift; makepre=$1; shift;;
***************
*** 61,74 ****
  done
  
! # Set default srcdir and config if not set by command line
  # (Not all systems have dirname)
  case $srcdir in
  '')	case $0 in
! 	*/*)	srcdir=`echo $0 | sed 's,/[^/]*$,,'`;;
! 	*)	srcdir=.;;
  	esac;;
  esac
  case $config in
! '')	config=$srcdir/config.c.in;;
  esac
  case $makepre in
--- 64,77 ----
  done
  
! # Set default libdir and config if not set by command line
  # (Not all systems have dirname)
  case $srcdir in
  '')	case $0 in
! 	*/*)	libdir=`echo $0 | sed 's,/[^/]*$,,'`;;
! 	*)	libdir=.;;
  	esac;;
  esac
  case $config in
! '')	config=$libdir/config.c.in;;
  esac
  case $makepre in
***************
*** 83,89 ****
  # Currently, only Cygwin needs this baggage.
  case `uname -s` in
! CYGWIN*) if test $srcdir = .
  	 then
! 	 	ExtraLibDir=..
  	 else
  	 	ExtraLibDir='$(LIBPL)'
--- 86,92 ----
  # Currently, only Cygwin needs this baggage.
  case `uname -s` in
! CYGWIN*) if test $libdir = .
  	 then
! 	 	ExtraLibDir=.
  	 else
  	 	ExtraLibDir='$(LIBPL)'
***************
*** 205,208 ****
--- 208,212 ----
  			*)     continue;;
  			esac
+ 			obj="$srcdir/$obj"
  			objs="$objs $obj"
  			case $src in
***************
*** 210,219 ****
  			/*) ;;
  			\$*) ;;
! 			*) src='$(srcdir)/'$src;;
  			esac
  			case $doconfig in
  			no)	cc="$cc \$(CCSHARED)";;
  			esac
! 			rule="$obj: $src; $cc $cpps \$(CFLAGS) -c $src"
  			echo "$rule" >>$rulesf
  		done
--- 214,223 ----
  			/*) ;;
  			\$*) ;;
! 			*) src='$(srcdir)/'"$srcdir/$src";;
  			esac
  			case $doconfig in
  			no)	cc="$cc \$(CCSHARED)";;
  			esac
! 			rule="$obj: $src; $cc $cpps \$(CFLAGS) -c $src -o $obj"
  			echo "$rule" >>$rulesf
  		done