[Kde-cygwin-cvs] CVS: kde-1.1.2/kdebase libtool.cygwin,1.5,1.6

[Ralf H. <hab...@us...>]

Update of /cvsroot/kde-cygwin/kde-1.1.2/kdebase
In directory usw-pr-cvs1:/tmp/cvs-serv12760/kdebase

Modified Files:
	libtool.cygwin 
Log Message:
fixed lib naming conventions (cygxxx-n.dll libxxx.dll.a)

Index: libtool.cygwin
===================================================================
RCS file: /cvsroot/kde-cygwin/kde-1.1.2/kdebase/libtool.cygwin,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** libtool.cygwin	2001/06/11 10:53:33	1.5
--- libtool.cygwin	2001/06/14 11:01:25	1.6
***************
*** 127,131 ****
  
  # Library versioning type.
! version_type=windows
  
  # Format of library name prefix.
--- 127,131 ----
  
  # Library versioning type.
! version_type=cygwin
  
  # Format of library name prefix.
***************
*** 134,138 ****
  # List of archive names.  First name is the real one, the rest are links.
  # The last name is the one that the linker finds with -lNAME.
! library_names_spec="\${libname}\`echo \${release} | sed -e s/[.]/-/g\`\${versuffix}.dll \$libname.dll.a"
  
  # The coded name of the library, if different from the real name.
--- 134,138 ----
  # List of archive names.  First name is the real one, the rest are links.
  # The last name is the one that the linker finds with -lNAME.
! library_names_spec="cyg\${libname}\`echo \${release} | sed -e s/[.]/-/g\`\${versuffix}.dll lib\$libname.dll.a"
  
  # The coded name of the library, if different from the real name.
***************
*** 149,154 ****
  
  # Commands used to build and install a shared archive.
! archive_cmds="\$CC -g -shared -v  -Wl,--out-implib,\$objdir/\$libname.dll.a 
! 							-Wl,--exclude-symbols=_cygwin_dll_entry@12 -Wl,--image-base=0x10000000
  							-o \$lib -Wl,--whole-archive \$libobjs -Wl,--no-whole-archive 
  							\$mydeplibs \$deplibs -L/usr/local/lib/qt1/lib -lqt -L/usr/X11R6/lib -lX11 -lXext"
--- 149,154 ----
  
  # Commands used to build and install a shared archive.
! archive_cmds="\$CC -g -shared -v  -Wl,--out-implib,\$objdir/lib\$libname.dll.a 
! 							-Wl,--disable-auto-image-base,--image-base=0x10000000
  							-o \$lib -Wl,--whole-archive \$libobjs -Wl,--no-whole-archive 
  							\$mydeplibs \$deplibs -L/usr/local/lib/qt1/lib -lqt -L/usr/X11R6/lib -lX11 -lXext"
***************
*** 1393,1397 ****
  	# Building a libtool convenience library.
  				libext=al
! 	oldlibs="$output_objdir/$libname.$libext $oldlibs"
  	build_libtool_libs=convenience
  	dependency_libs="$deplibs"
--- 1393,1397 ----
  	# Building a libtool convenience library.
  				libext=al
! 	oldlibs="$output_objdir/lib$libname.$libext $oldlibs"
  	build_libtool_libs=convenience
  	dependency_libs="$deplibs"
***************
*** 1506,1509 ****
--- 1506,1516 ----
  		;;
  
+ 	cygwin)
+ 		# Like Linux, but with '-' rather than '.', since we only
+ 		# want one extension on Windows 95.
+ 		major=`expr $current - $age`
+ 		versuffix="-$major"
+ 		;;
+ 
  	*)
  		$echo "$modename: unknown library version type \`$version_type'" 1>&2
***************
*** 1557,1561 ****
  			# Now set the variables for building old libraries.
  			if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
! 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
  
  	# Transform .lo files to .o files.
--- 1564,1568 ----
  			# Now set the variables for building old libraries.
  			if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
! 	oldlibs="$oldlibs $output_objdir/lib$libname.$libext"
  
  	# Transform .lo files to .o files.
***************
*** 2383,2387 ****
  		*.la)
  			old_library=
! 			test "$build_old_libs" = yes && old_library="$libname.$libext"
  			$show "creating $output"
  
--- 2390,2394 ----
  		*.la)
  			old_library=
! 			test "$build_old_libs" = yes && old_library="lib$libname.$libext"
  			$show "creating $output"