summaryrefslogtreecommitdiff
path: root/tests/offsets
diff options
context:
space:
mode:
authorColin Walters <walters@src.gnome.org>2008-11-13 19:57:12 +0000
committerColin Walters <walters@src.gnome.org>2008-11-13 19:57:12 +0000
commitb76cca0eb5ea3363ef738b7c9b3d3e9eefea6b79 (patch)
treed11bbc4e4fcf7fbf927a2ac801f793dfcc9bbfed /tests/offsets
parentb1b589ab793633352be375e18f0b3a821ae70afe (diff)
downloadgobject-introspection-b76cca0eb5ea3363ef738b7c9b3d3e9eefea6b79.tar.gz
Bug 558436 - avoid having scanner load app code
svn path=/trunk/; revision=912
Diffstat (limited to 'tests/offsets')
-rw-r--r--tests/offsets/Makefile.am15
1 files changed, 5 insertions, 10 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index 57cfdfb7..2c3cae20 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/common.mk
+
BUILT_SOURCES =
CLEANFILES =
EXTRA_DIST =
@@ -5,12 +7,6 @@ EXTRA_DIST =
check_LTLIBRARIES =
check_PROGRAMS =
-SCANNER = $(top_srcdir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
-SCANNER_LIBS = \
- $(top_srcdir)/giscanner/*.py \
- $(top_builddir)/giscanner/libgiscanner.la
-
############################################################
check_LTLIBRARIES += liboffsets.la
@@ -20,11 +16,10 @@ liboffsets_la_SOURCES = \
offsets.c
liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS)
# dummy rpath to get built dynamically (huh?)
-liboffsets_la_LDFLAGS = -module -avoid-version -rpath $(libdir)
+liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir)
-offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER) $(SCANNER_LIBS) Makefile
- PYTHONPATH=$(SCANNER_PYTHONPATH) $(CHECK_DEBUG) $(SCANNER) -v \
- --add-include-path=$(top_builddir)/gir --add-include-path=. \
+offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
+ $(CHECK_DEBUG) $(SCANNER) \
--library=offsets \
--namespace=offsets \
--nsversion=1.0 \