[Maxima-commits] CVS: maxima/src Makefile.am, 1.76, 1.76.2.1 ecl-depends.mk, 1.6, 1.6.2.1 maxima.system, 1.66, 1.66.2.1

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16760/src

Modified Files:
      Tag: RELEASE-5_17-BRANCH
	Makefile.am ecl-depends.mk maxima.system 
Log Message:
Minor changes to build system for ECL.
src/maxima.system: specify :ld-flags so LD_LIBRARY_PATH is unneeded
src/Makefile.am: build with defsystem instead of asdf
src/ecl-depends.mk: cut trailing balnk line

Index: Makefile.am
===================================================================
RCS file: /cvsroot/maxima/maxima/src/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.76.2.1
diff -u -d -r1.76 -r1.76.2.1
--- Makefile.am	22 Sep 2008 22:09:51 -0000	1.76
+++ Makefile.am	13 Dec 2008 18:08:05 -0000	1.76.2.1
@@ -274,22 +274,9 @@
 
 ecl:binary-ecl/maxima
 
-# We have to do some gymnastics here because ECL puts the
-# compiled application in the file "maxima", which would
-# overwrite the maxima shell script.
 binary-ecl/maxima:
-	test -f maxima && mv maxima maxima-tmp
-	success=true && \
-	$(EXECUTEECL) -eval "(require 'asdf)" -eval "(asdf:make-build \"maxima\" :type :program)" -eval "(ext:quit)" && \
-	mv maxima binary-ecl/maxima || \
-	success=false; \
-	test -f maxima-tmp && mv maxima-tmp maxima ; \
-	test $$success = true
-
-# This uses defsystem to build maxima with ecl.
-#binary-ecl/maxima:
-#	test -d binary-ecl || mkdir binary-ecl
-#	$(EXECUTEECL) -eval '(progn $(LOADDEFSYSTEM) $(DEFSYSTEMCOMPILE))' -eval '(quit)'
+	test -d binary-ecl || mkdir binary-ecl
+	$(EXECUTEECL) -eval '(progn $(LOADDEFSYSTEM) $(DEFSYSTEMCOMPILE))' -eval '(ext:quit)'
 
 install-ecl:
 	$(mkinstalldirs) "$(DESTDIR)$(verpkglibdir)/binary-ecl"

Index: ecl-depends.mk
===================================================================
RCS file: /cvsroot/maxima/maxima/src/ecl-depends.mk,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- ecl-depends.mk	22 Sep 2008 22:09:51 -0000	1.6
+++ ecl-depends.mk	13 Dec 2008 18:08:05 -0000	1.6.2.1
@@ -291,4 +291,3 @@
 binary-ecl/maxima : autol.lisp
 binary-ecl/maxima : max_ext.lisp
 binary-ecl/maxima : init-cl.lisp
-

Index: maxima.system
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima.system,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -d -r1.66 -r1.66.2.1
--- maxima.system	22 Sep 2008 22:09:52 -0000	1.66
+++ maxima.system	13 Dec 2008 18:08:05 -0000	1.66.2.1
@@ -42,6 +42,7 @@
 
 #+ecl
 (defun build-maxima-lib ()
+(format t "~%HELLO FROM BUILD-MAXIMA-LIB~%~%")
   (labels ((list-all-objects (module)
              (if (eql (mk::component-type module) :file)
 		 (list (mk::component-full-pathname module :binary))
@@ -59,7 +60,7 @@
 			     ;; Convert dir/foo.fas to dir/foo.o
 			     (make-pathname :type "o" :defaults p))
 			 files)))
-	(c::build-program "binary-ecl/maxima" :lisp-files obj
+	(c::build-program "binary-ecl/maxima" :lisp-files obj :ld-flags '("-Wl,-rpath=/usr/local/lib")
 			  :epilogue-code '(progn (require :defsystem)
 					         (cl-user::run)))))))