From 7eeab10c49f3971d45801da0a1914e46757252c9 Mon Sep 17 00:00:00 2001 From: zappo Date: Thu, 15 Oct 2009 02:55:46 +0000 Subject: [PATCH] (cit-remove-and-do-shared-lib): Enable for use with Make projects too. Create the srcs in a new lib directory. --- test/manual/cedet/cit-cpp.el | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/test/manual/cedet/cit-cpp.el b/test/manual/cedet/cit-cpp.el index 466c032e5b4..e162eaf6d25 100644 --- a/test/manual/cedet/cit-cpp.el +++ b/test/manual/cedet/cit-cpp.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2008, 2009 Eric M. Ludlam ;; Author: Eric M. Ludlam -;; X-RCS: $Id: cit-cpp.el,v 1.6 2009-09-14 02:38:13 zappo Exp $ +;; X-RCS: $Id: cit-cpp.el,v 1.7 2009-10-15 02:55:46 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 @@ -140,18 +140,22 @@ ) -(defun cit-remove-add-to-project-cpp () - "Remve foo.cpp from the current project. Add in a new generated file." - - (find-file (cit-file "src/foo.cpp")) +(defun cit-remove-add-to-project-cpp (make-type) + "Remve bar.cpp from the current project. +Create a new shared lib with bar.cpp in it. +Argument MAKE-TYPE is the type of make project to create." + (find-file (cit-file "src/bar.cpp")) ;; Whack the file (ede-remove-file t) (kill-buffer (current-buffer)) - (delete-file (cit-file "src/foo.cpp")) + (delete-file (cit-file "src/bar.cpp")) - ;; Make a new one - (cit-srecode-fill-with-stuff "src/bar.cpp" cit-src-cpp-tags) - (ede-add-file "Prog") + ;; Create a new shared lib target, and add bar.cpp to it. + (find-file (cit-file "lib/bar.cpp")) + (cit-srecode-fill-with-stuff "lib/bar.cpp" cit-src-cpp-tags) + (ede-new make-type "Libs") + (ede-new-target "testlib" "sharedobject" "n") + (ede-add-file "testlib") ;; 1 g) build the sources. ;; Direct compile to test that make fails properly. @@ -161,6 +165,13 @@ (accept-process-output) (sit-for 1)) + (let ((p (ede-current-project))) + (if (string= make-type "Automake") + (oset p :variables '( ( "AM_CPPFLAGS" . "-I../include") )) + (oset p :variables '( ( "CPPFLAGS" . "-I../include") ))) + (ede-commit-project p) + ) + (cit-compile-and-wait) ) -- 2.39.5