mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-21 21:20:44 -08:00
* lisp/calendar/todo-mode.el (todo-files, todo-rename-file) (todo-find-filtered-items-file, todo-reset-nondiary-marker) (todo-reset-done-string, todo-reset-comment-string) (todo-reset-highlight-item): * lisp/erc/erc-networks.el (erc-networks-alist): * lisp/gnus/gnus-art.el (gnus-button-handle-library): * lisp/gnus/gnus-group.el (gnus-read-ephemeral-gmane-group-url): * lisp/gnus/nntp.el (nntp-via-shell-prompt) (nntp-telnet-shell-prompt): * lisp/gnus/spam-report.el (spam-report-gmane-regex): * lisp/image-dired.el (image-dired-rotate-original): (image-dired-get-exif-file-name): * lisp/international/latin1-disp.el (latin1-display-ucs-per-lynx): * lisp/mail/undigest.el (rmail-digest-parse-rfc1153strict): * lisp/mh-e/mh-letter.el (mh-file-is-vcard-p): * lisp/mh-e/mh-mime.el (mh-file-mime-type-substitutions): * lisp/net/shr-color.el (shr-color->hexadecimal): * lisp/org/org-bibtex.el (org-bibtex-fields): * lisp/org/org-docview.el (org-docview-export): * lisp/org/org-entities.el (org-entities): * lisp/org/ox-icalendar.el (org-icalendar-cleanup-string): * lisp/progmodes/cperl-mode.el (cperl-indent-exp): * lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp) (ebnf-style-database): * lisp/progmodes/idlw-help.el (idlwave-do-context-help1): * lisp/progmodes/ruby-mode.el (ruby-imenu-create-index-in-block): * lisp/progmodes/sql.el (sql-product-alist): * lisp/progmodes/verilog-mode.el (verilog-error-regexp-emacs-alist) (verilog-error-font-lock-keywords) (verilog-assignment-operator-re): * lisp/progmodes/vhdl-mode.el (vhdl-compiler-alist): * lisp/textmodes/reftex-parse.el (reftex-parse-from-file): * lisp/vc/add-log.el (change-log-version-number-regexp-list): Fix typo by replacing ‘\’ with ‘\\’ in a string literal. For example, to get the regular expression ‘\.’ use the string literal "\\.", not "\." (which is equivalent to "."). * lisp/emulation/viper-util.el (viper-glob-unix-files): Remove stray ‘\j’ from string. * lisp/gnus/nntp.el (nntp-via-shell-prompt) (nntp-telnet-shell-prompt): Treat > like $ when matching a shell prompt. * lisp/progmodes/make-mode.el (makefile-browse): Properly quote a diagnostic.
210 lines
6.9 KiB
EmacsLisp
210 lines
6.9 KiB
EmacsLisp
;;; ede-proj-shared.el --- EDE Generic Project shared library support
|
|
|
|
;;; Copyright (C) 1998-2000, 2009-2015 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 - additive 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 - additive 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 "%.cpp"
|
|
: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"))
|
|
)
|
|
|
|
(cl-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"))))
|
|
|
|
(cl-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 actually 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"))))
|
|
|
|
(cl-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)
|
|
|
|
(cl-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"))
|
|
|
|
(cl-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")
|
|
(cl-call-next-method)))
|
|
|
|
|
|
(provide 'ede/proj-shared)
|
|
|
|
;;; ede/proj-shared.el ends here
|