luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 567813 – Everything should be versioned

Browse Source 
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
This commit is contained in:
Johan Dahlin 2009-01-15 22:31:07 +00:00 committed by Johan Dahlin
parent 3fff99dfcc
commit 9bf5ee61a4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -1,14 +1,14 @@
include $(top_srcdir)/gcov.mak
GCOVSOURCES = $(libgirepository_la_SOURCES)
GCOVSOURCES = $(libgirepository_1_0_la_SOURCES)
girepodir = $(includedir)/gobject-introspection-1.0/
girepo_HEADERS = girepository.h
lib_LTLIBRARIES = libgirepository.la
lib_LTLIBRARIES = libgirepository-1.0.la
noinst_LTLIBRARIES = libgirepository-parser.la
libgirepository_la_SOURCES = \
libgirepository_1_0_la_SOURCES = \
girepository.c \
gtypelib.h \
gtypelib.c \
@ -20,9 +20,9 @@ libgirepository_la_SOURCES = \
gdump.c \
ginvoke.c
libgirepository_la_CPPFLAGS = $(GIREPO_CFLAGS)
libgirepository_la_LIBADD = $(GIREPO_LIBS)
libgirepository_la_LDFLAGS = -no-undefined
libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS)
libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS)
libgirepository_1_0_la_LDFLAGS = -no-undefined
libgirepository_parser_la_SOURCES = \
girmodule.c \

2
girepository.c
View File

@ -132,7 +132,7 @@ init_globals (void)
libdir = GOBJECT_INTROSPECTION_LIBDIR;
typelib_dir = g_build_filename (libdir, "girepository", NULL);
typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
search_path = g_slist_prepend (search_path, typelib_dir);

2
girparser.c
View File

@ -243,7 +243,7 @@ locate_gir (GIrParser *parser,
}
for (dir = datadirs; *dir; dir++)
{
path = g_build_filename (*dir, "gir", girname, NULL);
path = g_build_filename (*dir, "gir-1.0", girname, NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
return path;
g_free (path);