From 7a122e8ae52a0cbce42baca3e35ab47671e028e9 Mon Sep 17 00:00:00 2001
From: stewartamiles <stewartamiles@40f4469a-5155-0410-be90-2de3f0bae501>
Date: Tue, 16 Sep 2008 01:16:42 +0000
Subject: [PATCH] Mon Sep 15 17:21:22 2008 Google Inc. <opensource@google.com> 
 * cmockery: version 0.12 	* Made it possible to specify additional
 compiler, lib tool and link 	flags on Windows. 	* Added Windows
 makefile to the tar ball.

Fri Aug 29 10:50:46 2008  Google Inc. <opensource@google.com>


git-svn-id: http://cmockery.googlecode.com/svn/trunk@18 40f4469a-5155-0410-be90-2de3f0bae501
---
 ltmain.sh              | 65 +++++++++---------------------------------
 packages/deb/changelog |  8 ++++--
 2 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/ltmain.sh b/ltmain.sh
index ac99f55..8fc56db 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,8 +1,3 @@
-# NOTE(csilvers): This file (ltmain.sh) is taken from
-#   http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz
-# with the following patch applied:
-#   http://www.marcuscom.com/downloads/patch-ltmain.sh
-
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
@@ -48,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -1609,18 +1604,11 @@ EOF
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
-	deplibs="$deplibs $arg"
 	continue
 	;;
 
       -module)
 	module=yes
-	case $host in
-	*-*-freebsd*)
-	  # Do not build the useless static library
-	  build_old_libs=no
-	  ;;
-	esac
 	continue
 	;;
 
@@ -2094,7 +2082,10 @@ EOF
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -2113,29 +2104,6 @@ EOF
 	  else
 	    compiler_flags="$compiler_flags $deplib"
 	  fi
-
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    ;;
-	  *)
-	    ;;
-	  esac # linkmode
-
 	  continue
 	  ;;
 	-l*)
@@ -3236,6 +3204,11 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -4740,9 +4713,6 @@ static const void *lt_preloaded_setup() {
             ;;
           esac
 	  ;;
-	*-*-freebsd*)
-	  # FreeBSD doesn't need this...
-	  ;;
 	*)
 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
 	  exit $EXIT_FAILURE
@@ -6033,17 +6003,10 @@ relink_command=\"$relink_command\""
 	fi
 
 	# Install the pseudo-library for information purposes.
-	case $host in
-	*-*-freebsd*)
-	  # Do not install the useless pseudo-library
-	  ;;
-	*)
-	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  instname="$dir/$name"i
-	  $show "$install_prog $instname $destdir/$name"
-	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-	  ;;
-	esac
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/packages/deb/changelog b/packages/deb/changelog
index 70c5d5a..11544e1 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,5 +1,7 @@
-cmockery (0.1-1) unstable; urgency=low
-
-  * Initial release.
+cmockery (0.1-2) unstable; urgency=low
+   * cmockery: version 0.12
+     Made it possible to specify additional compiler, lib tool and link 
+     flags on Windows.
+     Added Windows makefile to the tar ball.
 
  -- Google Inc. <opensource@google.com>  Mon, 28 Aug 2008 17:43:20 -0700
-- 
2.34.1