[lgtk-cvs] CVS update: lgtk/lgtk.asd

[Mario Mommer]

Update of /project/lgtk/cvsroot/lgtk
In directory common-lisp.net:/tmp/cvs-serv12192

Modified Files:
	lgtk.asd 
Log Message:
gtk libs now loaded with wrappers.o instead of with libhandle.o

Date: Thu May 13 15:33:49 2004
Author: mmommer

Index: lgtk/lgtk.asd
diff -u lgtk/lgtk.asd:1.9 lgtk/lgtk.asd:1.10
--- lgtk/lgtk.asd:1.9	Mon Mar  1 13:04:34 2004
+++ lgtk/lgtk.asd	Thu May 13 15:33:49 2004
@@ -61,7 +61,7 @@
   #+cmu (ext:run-program "pkg-config" '("--cflags" "gtk+-2.0")
 			  :output :stream))
 
-(defun get-gtk-cflags-list ()
+(defun get-gtk-cflags ()
   (let ((prc (pkg-config-cflags-string)))
     (if (not prc)
 	(error "Could not run #\"pckg-config!")
@@ -72,7 +72,7 @@
 	  (read-line str))))))
 
 (defparameter *gtklibs* (get-gtk-libs-list))
-(defparameter *gtkcflags* (get-gtk-cflags-list))
+(defparameter *gtkcflags* (get-gtk-cflags))
 (defvar *source-dir* nil)
 
 (defclass gtk-libs-handle (c-source-file) ())
@@ -83,10 +83,11 @@
 		       :defaults (component-pathname c))))
 
 (defmethod perform ((o compile-op) (c gtk-libs-handle))
-  (unless (zerop (run-shell-command "~A ~A -c -o ~A"
+  (unless (zerop (run-shell-command "~A ~A -c -o ~A ~A"
 				    *ccompiler*
 				    (namestring (component-pathname c))
-				    (namestring (car (output-files o c)))))
+				    (namestring (car (output-files o c)))
+				    *gtkcflags*))
     (error 'operation-error :component c :operation o)))
 
 (defmethod perform ((o load-op) (c gtk-libs-handle))
@@ -113,7 +114,7 @@
 	     (:file "bindings" :depends-on ("port"))
 
 
-	     (:gtk-libs-handle "libhandle")
+	     (:gtk-libs-handle "wrappers")
 
 
 	     (:file "gtkpackage" :depends-on ("widgets" "nexus"
@@ -124,7 +125,7 @@
 	     (:file "gtkclasshierarchy" :depends-on ("gtkpackage"))
 	     (:file "gtkbindings" :depends-on ("gtkenums"
 					       "gtkclasshierarchy"
-					       "libhandle"))
+					       "wrappers"))
 	     (:file "gtknexus" :depends-on ("gtkbindings"))
 	     (:file "gtklisp" :depends-on ("gtknexus"))