diff options
Diffstat (limited to 'lisp/cedet/ede/proj-obj.el')
| -rw-r--r-- | lisp/cedet/ede/proj-obj.el | 90 |
1 files changed, 63 insertions, 27 deletions
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el index 241ace2f167..6be76f1f11b 100644 --- a/lisp/cedet/ede/proj-obj.el +++ b/lisp/cedet/ede/proj-obj.el @@ -39,28 +39,32 @@ (configuration-variables :initform ("debug" . (("CFLAGS" . "-g") ("LDFLAGS" . "-g")))) ;; @TODO - add an include path. - (availablecompilers :initform (ede-gcc-compiler - ede-g++-compiler - ede-gfortran-compiler - ede-gfortran-module-compiler - ;; More C and C++ compilers, plus - ;; fortran or pascal can be added here - )) - (availablelinkers :initform (ede-g++-linker - ede-cc-linker - ede-gfortran-linker - ede-ld-linker - ;; Add more linker thingies here. - )) - (sourcetype :initform (ede-source-c - ede-source-c++ - ede-source-f77 - ede-source-f90 - ;; ede-source-other - ;; This object should take everything that - ;; gets compiled into objects like fortran - ;; and pascal. - )) + (availablecompilers :initform '(ede-gcc-compiler + ede-g++-compiler + ede-gfortran-compiler + ede-gfortran-module-compiler + ede-lex-compiler + ede-yacc-compiler + ;; More C and C++ compilers, plus + ;; fortran or pascal can be added here + )) + (availablelinkers :initform '(ede-g++-linker + ede-cc-linker + ede-ld-linker + ede-gfortran-linker + ;; Add more linker thingies here. + )) + (sourcetype :initform '(ede-source-c + ede-source-c++ + ede-source-f77 + ede-source-f90 + ede-source-lex + ede-source-yacc + ;; ede-source-other + ;; This object should take everything that + ;; gets compiled into objects like fortran + ;; and pascal. + )) ) "Abstract class for Makefile based object code generating targets. Belonging to this group assumes you could make a .o from an element source @@ -115,15 +119,15 @@ file.") :name "cc" :sourcetype '(ede-source-c) :variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L.")) - :commands '("$(C_LINK) -o $@ $^") + :commands '("$(C_LINK) -o $@ $^ $(LDDEPS)") :objectextention "") "Linker for C sourcecode.") (defvar ede-source-c++ (ede-sourcecode "ede-source-c++" :name "C++" - :sourcepattern "\\.\\(cpp\\|cc\\|cxx\\)$" - :auxsourcepattern "\\.\\(hpp\\|hh?\\|hxx\\)$" + :sourcepattern "\\.\\(c\\(pp?\\|c\\|xx\\|++\\)\\|C\\\(PP\\)?\\)$" + :auxsourcepattern "\\.\\(hpp?\\|hh?\\|hxx\\|H\\)$" :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo")) "C++ source code definition.") @@ -158,11 +162,43 @@ file.") ;; Only use this linker when c++ exists. :sourcetype '(ede-source-c++) :variables '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L.")) - :commands '("$(CXX_LINK) -o $@ $^") + :commands '("$(CXX_LINK) -o $@ $^ $(LDDEPS)") :autoconf '("AC_PROG_CXX") :objectextention "") "Linker needed for c++ programs.") +;;; LEX +(defvar ede-source-lex + (ede-sourcecode "ede-source-lex" + :name "lex" + :sourcepattern "\\.l\\(l\\|pp\\|++\\)") + "Lex source code definition. +No garbage pattern since it creates C or C++ code.") + +(defvar ede-lex-compiler + (ede-object-compiler + "ede-lex-compiler" + ;; Can we support regular makefiles too?? + :autoconf '("AC_PROG_LEX") + :sourcetype '(ede-source-lex)) + "Compiler used for Lexical source.") + +;;; YACC +(defvar ede-source-yacc + (ede-sourcecode "ede-source-yacc" + :name "yacc" + :sourcepattern "\\.y\\(y\\|pp\\|++\\)") + "Yacc source code definition. +No garbage pattern since it creates C or C++ code.") + +(defvar ede-yacc-compiler + (ede-object-compiler + "ede-yacc-compiler" + ;; Can we support regular makefiles too?? + :autoconf '("AC_PROG_YACC") + :sourcetype '(ede-source-yacc)) + "Compiler used for yacc/bison grammar files source.") + ;;; Fortran Compiler/Linker ;; ;; Contributed by David Engster @@ -233,7 +269,7 @@ file.") :name "ld" :variables '(("LD" . "ld") ("LD_LINK" . "$(LD) $(LDFLAGS) -L.")) - :commands '("$(LD_LINK) -o $@ $^") + :commands '("$(LD_LINK) -o $@ $^ $(LDDEPS)") :objectextention "") "Linker needed for c++ programs.") |