Remove unused variables, add a dependency of girepository.ch, so when they

2008-11-12  Johan Dahlin  <jdahlin@async.com.br>

        * gir/Makefile.am:
        Remove unused variables, add a dependency of girepository.ch, so when
        they change we rebuild the gir automatically.

svn path=/trunk/; revision=894

diff --git a/ChangeLog b/ChangeLog
index 2f63b00..0a4e7b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-12  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gir/Makefile.am:
+       Remove unused variables, add a dependency of girepository.ch, so when
+       they change we rebuild the gir automatically.
+
 2008-11-12  Johan Dahlin  <jdahlin@async.com.br>
 
        * girepository/girepository.c (g_irepository_get_search_path):

diff --git a/gir/Makefile.am b/gir/Makefile.am
index 99650be..0e21391 100644 (file)
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -118,10 +118,11 @@ BUILT_SOURCES += Gio-2.0.gir
 EXTRA_DIST += gio-2.0.c
 
 # girepository
-GIREPOSITORY_INCLUDEDIR=`pkg-config --variable=includedir girepository-2.0`/glib-2.0
-GIREPOSITORY_LIBDIR=`pkg-config --variable=libdir girepository-2.0`
+GIREPOSITORY_FILES = \
+       $(top_srcdir)/girepository/girepository.c \
+       $(top_srcdir)/girepository/girepository.h
 
-GIRepository-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
+GIRepository-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) $(GIREPOSITORY_FILES)
        PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \
            -v --namespace GIRepository --nsversion=1.0\
            --add-include-path=. \
@@ -133,8 +134,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
            -I$(srcdir)/girepository \
             --pkg glib-2.0 \
             --pkg gobject-2.0 \
-           $(top_srcdir)/girepository/girepository.c \
-           $(top_srcdir)/girepository/girepository.h
+           $(GIREPOSITORY_FILES)
 BUILT_SOURCES += GIRepository-2.0.gir
 
 # Generic rules