67d3ffe498
* cedet/srecode/compile.el: * cedet/semantic/mru-bookmark.el: * cedet/semantic/debug.el: * cedet/semantic/complete.el: * cedet/semantic/analyze.el: Require CL when compiling. * cedet/semantic/scope.el (semantic-analyze-scoped-inherited-tag-map): Wrap calculation of tmpscope so that the regular scope will continue to work. * cedet/semantic/idle.el (semantic-idle-tag-highlight): Use semantic-idle-summary-highlight-face as the highlighting. * emacs-lisp/eieio-base.el (eieio-persistent-save): If buffer contains multibyte characters, choose first applicable coding system automatically. * cedet/ede/project-am.el (project-run-target): New method. (project-run-target): New method. * cedet/ede.el (ede-target): Add run target menu item. (ede-project, ede-minor-keymap): Add ede-run-target binding. (ede-run-target): New function. (ede-target::project-run-target): New method. * cedet/ede/proj.el (project-run-target): New method. * cedet/ede/proj-shared.el (ede-gcc-libtool-shared-compiler) (ede-g++-libtool-shared-compiler): Remove SHELL. Remove COMMANDS. Add :rules. (ede-proj-target-makefile-shared-object): Only libtool compilers now available. Add linkers for libtool. (ede-cc-linker-libtool, ede-g++-linker-libtool): New. (ede-proj-makefile-target-name): Always use .la extension. * cedet/ede/proj-prog.el (project-run-target): New method. * cedet/ede/proj-obj.el (ede-cc-linker): Rename from ede-gcc-linker. (ede-g++-linker): Change Change link lines. * cedet/ede/pmake.el (ede-pmake-insert-variable-shared): When searching for old variables, go to the end of the buffer and search backward from there. (ede-proj-makefile-automake-insert-subdirs) (ede-proj-makefile-automake-insert-extradist): New methods. (ede-proj-makefile-create): Use them. * cedet/ede/pconf.el (ede-proj-configure-test-required-file): Force FILE to expand to the current target. Use file-exists-p to check that it exists. * cedet/ede/linux.el (ede-linux-version): Don't call "head". (ede-linux-load): Wrap dir in file-name-as-directory. Set :version slot. * cedet/ede/files.el (ede-get-locator-object): When enabling locate, do so on "top". * cedet/ede/emacs.el (ede-emacs-file-existing): Wrap "dir" in file-name-as-directory during compare. (ede-emacs-version): Return Emacs/XEmacs differentiator. Get version number from different places. Don't call egrep. (ede-emacs-load): Set :version slot. Call file-name-as-directory to set the directory. * cedet/ede/shell.el: New file. * cedet/inversion.el (inversion-decoders): Allow for stray . in alpha/beta variants.
211 lines
7 KiB
EmacsLisp
211 lines
7 KiB
EmacsLisp
;;; ede-proj-shared.el --- EDE Generic Project shared library support
|
|
|
|
;;; Copyright (C) 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Keywords: project, make
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Handle shared object libraries in and EDE Project file.
|
|
;; Tries to deal with libtool and non-libtool situations.
|
|
|
|
(require 'ede/pmake)
|
|
(require 'ede/proj-obj)
|
|
(require 'ede/proj-prog)
|
|
|
|
;;; THIS NEEDS WORK. SEE ede-proj-obj.
|
|
|
|
;;; Code:
|
|
(defclass ede-proj-target-makefile-shared-object
|
|
(ede-proj-target-makefile-program)
|
|
((availablecompilers :initform (ede-gcc-libtool-shared-compiler
|
|
;;ede-gcc-shared-compiler
|
|
ede-g++-libtool-shared-compiler
|
|
;;ede-g++-shared-compiler
|
|
))
|
|
(availablelinkers :initform (ede-cc-linker-libtool
|
|
ede-g++-linker-libtool
|
|
;; Add more linker thingies here.
|
|
))
|
|
(ldflags :custom (repeat (string :tag "Libtool flag"))
|
|
:documentation
|
|
"Additional flags to add when linking this shared library.
|
|
Use ldlibs to add addition libraries.")
|
|
)
|
|
"This target generates a shared library.")
|
|
|
|
(defvar ede-gcc-shared-compiler
|
|
(clone ede-gcc-compiler
|
|
"ede-c-shared-compiler"
|
|
:name "gcc -shared"
|
|
:variables '(("CC_SHARED" . "gcc")
|
|
("C_SHARED_COMPILE" .
|
|
"$(CC_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
|
|
; :linkvariables '(("C_SHARED_LINK" .
|
|
; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
|
|
; )
|
|
; :commands '("$(C_SHARED_LINK) %s")
|
|
;; @TODO - addative modification of autoconf.
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
)
|
|
"Compiler for C sourcecode.")
|
|
|
|
(defvar ede-gcc-libtool-shared-compiler
|
|
(clone ede-gcc-shared-compiler
|
|
"ede-c-shared-compiler-libtool"
|
|
:name "libtool"
|
|
:variables '(("LIBTOOL" . "libtool")
|
|
("LTCOMPILE" . "$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
|
|
("LTLINK" . "$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@")
|
|
)
|
|
:rules (list (ede-makefile-rule
|
|
"cc-inference-rule-libtool"
|
|
:target "%.o"
|
|
:dependencies "%.c"
|
|
:rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
|
|
"$(LTCOMPILE) -o $@ $<"
|
|
)
|
|
))
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
)
|
|
"Compiler for C sourcecode.")
|
|
|
|
(defvar ede-cc-linker-libtool
|
|
(clone ede-cc-linker
|
|
"ede-cc-linker-libtool"
|
|
:name "cc shared"
|
|
;; Only use this linker when c++ exists.
|
|
:sourcetype '(ede-source-c++)
|
|
:variables '(
|
|
("LIBTOOL" . "libtool")
|
|
("LTLINK" . "$(LIBTOOL) --tag=CPP --mode=link $(CPP) $(CFLAGS) $(LDFLAGS) -L. -o $@")
|
|
)
|
|
:commands '("$(LTLINK) -o $@ $^")
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
:objectextention ".la")
|
|
"Linker needed for c++ programs.")
|
|
|
|
(defvar ede-g++-shared-compiler
|
|
(clone ede-g++-compiler
|
|
"ede-c++-shared-compiler"
|
|
:name "gcc -shared"
|
|
:variables '(("CXX_SHARED" . "g++")
|
|
("CXX_SHARED_COMPILE" .
|
|
"$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
|
|
;; @TODO - addative modification of autoconf.
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
)
|
|
"Compiler for C sourcecode.")
|
|
|
|
(defvar ede-g++-libtool-shared-compiler
|
|
(clone ede-g++-shared-compiler
|
|
"ede-c++-shared-compiler-libtool"
|
|
:name "libtool"
|
|
:variables '(("CXX" "g++")
|
|
("LIBTOOL" . "libtool")
|
|
("LTCOMPILE" . "$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
|
|
)
|
|
:rules (list (ede-makefile-rule
|
|
"c++-inference-rule-libtool"
|
|
:target "%.o"
|
|
:dependencies "%.c"
|
|
:rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
|
|
"$(LTCOMPILE) -o $@ $<"
|
|
)
|
|
))
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
)
|
|
"Compiler for C sourcecode.")
|
|
|
|
(defvar ede-g++-linker-libtool
|
|
(clone ede-g++-linker
|
|
"ede-g++-linker-libtool"
|
|
:name "g++"
|
|
;; Only use this linker when c++ exists.
|
|
:sourcetype '(ede-source-c++)
|
|
:variables '(
|
|
("LIBTOOL" . "libtool")
|
|
("LTLINK" . "$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(CFLAGS) $(LDFLAGS) -L. -o $@")
|
|
)
|
|
:commands '("$(LTLINK) -o $@ $^")
|
|
:autoconf '("AC_PROG_LIBTOOL")
|
|
:objectextention ".la")
|
|
"Linker needed for c++ programs.")
|
|
|
|
;;; @TODO - C++ versions of the above.
|
|
|
|
(when nil
|
|
|
|
|
|
(insert;; These C to O rules create dependencies
|
|
"%.o: %.c\n"
|
|
"\t@echo '$(COMPILE) -c $<'; \\\n"
|
|
"\t$(COMPILE)"
|
|
(if (oref this automatic-dependencies)
|
|
" -Wp,-MD,.deps/$(*F).P"
|
|
"")
|
|
" -c $<\n\n")
|
|
(if have-libtool
|
|
(insert;; These C to shared o rules create pic code.
|
|
"%.lo: %.c\n"
|
|
"\t@echo '$(LTCOMPILE) -c $<'; \\\n"
|
|
"\t$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<\n"
|
|
"\t@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \\\n"
|
|
"\t < .deps/$(*F).p > .deps/$(*F).P\n"
|
|
"\t@-rm -f .deps/$(*F).p\n\n"))
|
|
)
|
|
|
|
(defmethod ede-proj-configure-add-missing
|
|
((this ede-proj-target-makefile-shared-object))
|
|
"Query if any files needed by THIS provided by automake are missing.
|
|
Results in --add-missing being passed to automake."
|
|
(not (and (ede-expand-filename (ede-toplevel) "ltconfig")
|
|
(ede-expand-filename (ede-toplevel) "ltmain.sh"))))
|
|
|
|
(defmethod ede-proj-makefile-insert-automake-pre-variables
|
|
((this ede-proj-target-makefile-shared-object))
|
|
"Insert bin_PROGRAMS variables needed by target THIS.
|
|
We aren't acutally inserting SOURCE details, but this is used by the
|
|
Makefile.am generator, so use it to add this important bin program."
|
|
(ede-pmake-insert-variable-shared "lib_LTLIBRARIES"
|
|
(insert (concat "lib" (ede-name this) ".la"))))
|
|
|
|
(defmethod ede-proj-makefile-insert-automake-post-variables
|
|
((this ede-proj-target-makefile-shared-object))
|
|
"Insert bin_PROGRAMS variables needed by target THIS.
|
|
We need to override -program which has an LDADD element."
|
|
nil)
|
|
|
|
(defmethod ede-proj-makefile-target-name ((this ede-proj-target-makefile-shared-object))
|
|
"Return the name of the main target for THIS target."
|
|
;; We need some platform gunk to make the .so change to .sl, or .a,
|
|
;; depending on the platform we are going to compile against.
|
|
(concat "lib" (ede-name this) ".la"))
|
|
|
|
(defmethod ede-proj-makefile-sourcevar ((this ede-proj-target-makefile-shared-object))
|
|
"Return the variable name for THIS's sources."
|
|
(if (eq (oref (ede-target-parent this) makefile-type) 'Makefile.am)
|
|
(concat "lib" (oref this name) "_la_SOURCES")
|
|
(call-next-method)))
|
|
|
|
|
|
(provide 'ede/proj-shared)
|
|
|
|
;; arch-tag: 05f22c3e-b269-4411-9425-65e8fe4ab74a
|
|
;;; ede/proj-shared.el ends here
|