pybank r52 - in trunk: . bank

[robtaylor svn gnome org]

Author: robtaylor
Date: Tue Mar 11 13:42:46 2008
New Revision: 52
URL: http://svn.gnome.org/viewvc/pybank?rev=52&view=rev

Log:
2008-03-11  Rob Taylor  <rob taylor codethink co uk>

	* Makefile:
	* bank/importer.py:
	Some fixes to start working with new g-idl-compiler changes.


Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/bank/importer.py

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Mar 11 13:42:46 2008
@@ -1,8 +1,5 @@
-IRPATH=../gobject-introspection/girepository
-GIPATH=../gobject-introspection/
-
-IR_CFLAGS=-Wl,-rpath $(IRPATH)/.libs -g -Wall -I$(IRPATH) `pkg-config --cflags glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0`
-IR_LIBS=-L$(IRPATH)/.libs -lgirepository -lffi `pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0`
+IR_CFLAGS=-g -Wall `pkg-config --cflags glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gobject-introspection`
+IR_LIBS=`pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gobject-introspection`
 
 PY_VERSION=2.5
 PY_CFLAGS=-I/usr/include/python$(PY_VERSION) `pkg-config --cflags pygobject-2.0`
@@ -16,7 +13,7 @@
 	bank/bank-info.c 	\
 	bank/bank-repository.c
 
-all: bank/repo.so Poppler.repo GLib.repo Atk.repo Pango.repo Gdk.repo Gtk.repo
+all: bank/repo.so Poppler-introspection.so GLib-introspection.so Atk-introspection.so Pango-introspection.so Gdk-introspection.so Gtk-introspection.so
 
 bank/repo.so: $(BANK_SOURCES)
 	gcc -shared -o bank/repo.so $(BANK_SOURCES) $(IR_CFLAGS) $(IR_LIBS) $(PY_CFLAGS) $(PY_LIBS) 
@@ -49,10 +46,12 @@
 clean:
 	@rm -f bank/repo.so *.repo
 
-%.repo: data/%.gidl
-	$(GIPATH)/tools/g-idl-compiler --raw $< --output $@
+%-introspection.c: data/%.gidl
+	`pkg-config --variable g_idl_compiler gobject-introspection`  $< --output $@
+%-introspection.so: %-introspection.c
+	gcc --shared $(IR_CFLAGS) -o $@ $^
 
-test: bank/repo.so poppler.repo
+test: bank/repo.so GLib-introspection.so Poppler-introspection.so
 	LD_PRELOAD=$(POPPLER_DIR)/libpoppler-glib.so \
         LD_LIBRARY_PATH=$(POPPLER_DIR) python$(PY_VERSION) simple.py test.pdf
 

Modified: trunk/bank/importer.py
==============================================================================
--- trunk/bank/importer.py	(original)
+++ trunk/bank/importer.py	Tue Mar 11 13:42:46 2008
@@ -28,7 +28,7 @@
     @staticmethod
     def find_module(name, path):
         for path in os.environ.get("GIREPO_PATH", ".").split(":"):
-            filename = os.path.join(path, name + '.repo')
+            filename = os.path.join(path, name + '-introspection.so')
             if os.path.exists(filename):
                 return DynamicImporter(name, filename)