From: zappo Date: Sun, 16 May 2010 13:32:27 +0000 (+0000) Subject: (cit-remove-and-do-shared-lib): Add ldlibs-local test. X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb8b935bd5fcd9c683c692e73caf10077d08e025;p=emacs.git (cit-remove-and-do-shared-lib): Add ldlibs-local test. --- diff --git a/test/manual/cedet/cit-cpp.el b/test/manual/cedet/cit-cpp.el index 258566066fd..0a6081ef5c0 100644 --- a/test/manual/cedet/cit-cpp.el +++ b/test/manual/cedet/cit-cpp.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam ;; Author: Eric M. Ludlam -;; X-RCS: $Id: cit-cpp.el,v 1.11 2010-05-16 13:12:26 zappo Exp $ +;; X-RCS: $Id: cit-cpp.el,v 1.12 2010-05-16 13:32:27 zappo Exp $ ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -234,8 +234,20 @@ Create a new shared lib with bar.cpp in it." (cit-wait-for-compilation) (cit-check-compilation-for-error t) ;; that should have errored. - (cit-compile-and-wait) - )) + (cit-compile-and-wait) + + ;; Use the local libs version also to make sure it works. + (let ((mt ede-object)) + (if (string= make-type "Automake") + (progn + (oset mt :ldlibs-local '("../lib/libtestlib.la")) + (oset mt :ldflags nil) + (oset mt :ldlibs nil)) + ;; FIX THIS + (oset mt :ldflags '("../lib/bar.o"));;HACK for libtool! + )) + (cit-compile-and-wait) + ) (provide 'cit-cpp) ;;; cit-cpp.el ends here