pybank r55 - trunk

[walters svn gnome org]

Author: walters
Date: Sat Jul 26 20:28:22 2008
New Revision: 55
URL: http://svn.gnome.org/viewvc/pybank?rev=55&view=rev

Log:
2007-07-26  Colin Walters  <walters verbum org>

	* Makefile: Use installed gobject-introspection.pc
	file.  Also add -fPIC when making shared libraries.




Modified:
   trunk/ChangeLog
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Jul 26 20:28:22 2008
@@ -1,8 +1,6 @@
-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`
+PCDEPS=glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gobject-introspection-1.0
+IR_CFLAGS=-g -Wall -I$(IRPATH) `pkg-config --cflags $(PCDEPS)`
+IR_LIBS=-lffi `pkg-config --libs $(PCDEPS)`
 
 PY_VERSION=2.5
 PY_CFLAGS=-I/usr/include/python$(PY_VERSION) `pkg-config --cflags pygobject-2.0`
@@ -19,7 +17,7 @@
 all: bank/repo.so Poppler.repo GLib.repo Atk.repo Pango.repo Gdk.repo Gtk.repo
 
 bank/repo.so: $(BANK_SOURCES)
-	gcc -shared -o bank/repo.so $(BANK_SOURCES) $(IR_CFLAGS) $(IR_LIBS) $(PY_CFLAGS) $(PY_LIBS) 
+	gcc -fPIC -shared -o bank/repo.so $(BANK_SOURCES) $(IR_CFLAGS) $(IR_LIBS) $(PY_CFLAGS) $(PY_LIBS) 
 
 data/Atk.gidl: defs2gidl.py defs/atk.defs defs/atk-types.defs
 	python defs2gidl.py -o $@ \
@@ -50,7 +48,7 @@
 	@rm -f bank/repo.so *.repo
 
 %.repo: data/%.gidl
-	$(GIPATH)/tools/g-idl-compiler --raw $< --output $@
+	g-idl-compiler --raw $< --output $@
 
 test: bank/repo.so poppler.repo
 	LD_PRELOAD=$(POPPLER_DIR)/libpoppler-glib.so \