Bug 567813 – Everything should be versioned

2009-01-15  Johan Dahlin  <jdahlin@async.com.br>

        Bug 567813 – Everything should be versioned

        * gir/Makefile.am:
        * girepository/Makefile.am:
        * girepository/girepository.c (init_globals):
        * girepository/girparser.c (locate_gir):
        * giscanner/dumper.py:
        * giscanner/transformer.py:
        * gobject-introspection-1.0.pc.in:
        * tests/everything/Makefile.am:
        * tests/invoke/Makefile.am:
        * tests/offsets/Makefile.am:
        * tests/repository/Makefile.am:
        * tests/scanner/Makefile.am:
        * tools/Makefile.am:


svn path=/trunk/; revision=1046

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/everything/Makefile.am b/tests/everything/Makefile.am
index 5055dca5..72daa7dd 100644
--- a/tests/everything/Makefile.am
+++ b/tests/everything/Makefile.am
@@ -10,15 +10,15 @@ AM_CFLAGS = $(GOBJECT_CFLAGS)
 AM_LDFLAGS = -version-info $(LT_VERSION)
 LIBS = $(GOBJECT_LIBS)
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(TYPELIBS)
 
-girsdir = $(datadir)/gir
+girsdir = $(datadir)/gir-1.0
 girs_DATA = $(GIRS)
 
-lib_LTLIBRARIES = libgirepository-everything.la
+lib_LTLIBRARIES = libgirepository-everything-1.0.la
 
-libgirepository_everything_la_SOURCES = $(srcdir)/everything.c $(srcdir)/everything.h
+libgirepository_everything_1_0_la_SOURCES = $(srcdir)/everything.c $(srcdir)/everything.h
 
 if OS_WIN32
 AM_LDFLAGS += -no-undefined
@@ -30,11 +30,11 @@ TXMLS = $(GIRS:.gir=.tgir)
 CLEANFILES = $(TYPELIBS) $(TXMLS) $(GIRS)
 BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
 
-Everything-$(TYPELIB_VERSION).gir: libgirepository-everything.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
+Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
 	$(CHECK_DEBUG) $(SCANNER) \
 	--include=GObject-2.0 \
         --libtool="$(LIBTOOL)" \
-	--library=girepository-everything \
+	--library=girepository-everything-1.0 \
 	--namespace=Everything --nsversion=$(TYPELIB_VERSION) \
 	--pkg gobject-2.0 \
 	$(srcdir)/everything.h $(srcdir)/everything.c \
diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index 2177bd79..54c28ffe 100644
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -10,7 +10,7 @@ testfns_la_SOURCES =				\
 	testfns-metadata.c
 testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 testfns_la_LDFLAGS = -module -avoid-version
-testfns_la_LIBADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+testfns_la_LIBADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 if OS_WIN32
 testfns_la_LDFLAGS += -no-undefined
@@ -24,11 +24,11 @@ testfns-metadata.c: testfns-1.0.gir $(top_builddir)/tools/g-ir-compiler Makefile
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
-invoke_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+invoke_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 genericmarshaller_SOURCES = genericmarshaller.c
 genericmarshaller_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
-genericmarshaller_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+genericmarshaller_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 TESTS = invoke genericmarshaller invoke-namespace-find.sh
 
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index d04b8015..8673aff9 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -39,7 +39,7 @@ check_PROGRAMS += gitestoffsets
 
 nodist_gitestoffsets_SOURCES = gitestoffsets.c
 gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestoffsets_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestoffsets_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestoffsets.c: gen-gitestoffsets offsets.h
 	$(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false )
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 51e97673..1dd5c4c7 100644
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -6,11 +6,11 @@ noinst_PROGRAMS = gitestrepo gitestthrows
 
 gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 TESTS = gitestrepo gitestthrows
 TESTS_ENVIRONMENT=env top_builddir="$(top_builddir)" $(DEBUG)
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index a3e52db7..36fb772b 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -106,7 +106,7 @@ GIRS += GtkFrob-1.0.gir
 noinst_PROGRAMS = barapp
 
 barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
-barapp_LDADD = $(top_builddir)/girepository/libgirepository.la
+barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
 	$(SCANNER) \