[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-obj.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-obj.el |
Date: |
Thu, 08 Oct 2009 14:09:14 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/08 14:09:13
Modified files:
lisp : ChangeLog
lisp/cedet/ede : proj-obj.el
Log message:
* cedet/ede/proj-obj.el (ede-gcc-linker): New var.
(ede-proj-target-makefile-objectcode): Use it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16387&r2=1.16388
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj-obj.el?cvsroot=emacs&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16387
retrieving revision 1.16388
diff -u -b -r1.16387 -r1.16388
--- ChangeLog 8 Oct 2009 01:49:05 -0000 1.16387
+++ ChangeLog 8 Oct 2009 14:09:09 -0000 1.16388
@@ -1,5 +1,8 @@
2009-10-08 Chong Yidong <address@hidden>
+ * cedet/ede/proj-obj.el (ede-gcc-linker): New var.
+ (ede-proj-target-makefile-objectcode): Use it.
+
* cedet/ede/source.el (ede-want-any-source-files-p)
(ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return
search result. This error was introduced while merging.
Index: cedet/ede/proj-obj.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj-obj.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cedet/ede/proj-obj.el 2 Oct 2009 10:53:34 -0000 1.4
+++ cedet/ede/proj-obj.el 8 Oct 2009 14:09:13 -0000 1.5
@@ -46,9 +46,10 @@
;; fortran or pascal can be added here
))
(availablelinkers :initform (ede-g++-linker
- ;; Add more linker thingies here.
- ede-ld-linker
+ ede-gcc-linker
ede-gfortran-linker
+ ede-ld-linker
+ ;; Add more linker thingies here.
))
(sourcetype :initform (ede-source-c
ede-source-c++
@@ -107,6 +108,16 @@
:uselinker t)
"Compiler for C sourcecode.")
+(defvar ede-gcc-linker
+ (ede-linker
+ "ede-gcc-linker"
+ :name "gcc"
+ :sourcetype '(ede-source-c)
+ :variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
+ :commands '("$(C_LINK) -o $@ $^")
+ :objectextention "")
+ "Linker for C sourcecode.")
+
(defvar ede-source-c++
(ede-sourcecode "ede-source-c++"
:name "C++"
@@ -145,10 +156,8 @@
:name "g++"
;; Only use this linker when c++ exists.
:sourcetype '(ede-source-c++)
- :variables '(("CXX_LINK" .
- "$(CXX) $(CFLAGS) $(LDFLAGS) -L. -o $@")
- )
- :commands '("$(CXX_LINK) $^")
+ :variables '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L."))
+ :commands '("$(CXX_LINK) -o $@ $^")
:autoconf '("AC_PROG_CXX")
:objectextention "")
"Linker needed for c++ programs.")
@@ -210,10 +219,8 @@
"ede-gfortran-linker"
:name "gfortran"
:sourcetype '(ede-source-f90 ede-source-f77)
- :variables '(("F90_LINK" .
- "$(F90) $(CFLAGS) $(LDFLAGS) -L. -o $@")
- )
- :commands '("$(F90_LINK) $^")
+ :variables '(("F90_LINK" . "$(F90) $(CFLAGS) $(LDFLAGS) -L."))
+ :commands '("$(F90_LINK) -o $@ $^")
:objectextention "")
"Linker needed for Fortran programs.")
@@ -224,10 +231,8 @@
"ede-ld-linker"
:name "ld"
:variables '(("LD" . "ld")
- ("LD_LINK" .
- "$(LD) $(LDFLAGS) -L. -o $@")
- )
- :commands '("$(LD_LINK) $^")
+ ("LD_LINK" . "$(LD) $(LDFLAGS) -L."))
+ :commands '("$(LD_LINK) -o $@ $^")
:objectextention "")
"Linker needed for c++ programs.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj-obj.el,
Chong Yidong <=