Permalink
Browse files

fixed the exports problem

  • Loading branch information...
1 parent 0dee29b commit 9dc11f8a42e66797db7ed015ac5f2703435f4456 James Michael DuPont committed Mar 24, 2012
Showing with 40 additions and 22 deletions.
  1. +23 −17 Makefile-girepository.am
  2. +0 −2 Makefile-tools.am
  3. +8 −1 girepository/girparser.c
  4. +3 −0 girepository/girparser.h
  5. +1 −1 tests/repository/Makefile.am
  6. +5 −1 tools/compiler.c
View
@@ -19,29 +19,24 @@ girepo_HEADERS = \
girepository/gitypelib.h \
girepository/gitypes.h \
girepository/giunioninfo.h \
- girepository/givfuncinfo.h
+ girepository/givfuncinfo.h \
+ girepository/girmodule.h \
+ girepository/girnode.h \
+ girepository/girparser.h \
+ girepository/girwriter.h \
+ girepository/girmodule.h \
+ girepository/girnode.h \
+ girepository/girparser.h \
+ girepository/girwriter.h
lib_LTLIBRARIES += libgirepository-1.0.la
-noinst_LTLIBRARIES += libgirepository-internals.la libgirepository-gthash.la
+noinst_LTLIBRARIES += libgirepository-gthash.la
libgirepository_gthash_la_SOURCES = \
girepository/gthash.c
libgirepository_gthash_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS)
-libgirepository_internals_la_SOURCES = \
- girepository/girmodule.c \
- girepository/girmodule.h \
- girepository/girnode.c \
- girepository/girnode.h \
- girepository/giroffsets.c \
- girepository/girparser.c \
- girepository/girparser.h \
- girepository/girwriter.c \
- girepository/girwriter.h
-
-libgirepository_internals_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-libgirepository_internals_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
libgirepository_1_0_la_SOURCES = \
girepository/gdump.c \
@@ -68,11 +63,22 @@ libgirepository_1_0_la_SOURCES = \
girepository/gitypelib-internal.h \
girepository/glib-compat.h \
girepository/giunioninfo.c \
- girepository/givfuncinfo.c
+ girepository/givfuncinfo.c \
+ girepository/girmodule.c \
+ girepository/girmodule.h \
+ girepository/girnode.c \
+ girepository/girnode.h \
+ girepository/giroffsets.c \
+ girepository/girparser.c \
+ girepository/girparser.h \
+ girepository/girwriter.c \
+ girepository/girwriter.h
+
libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -DG_IREPOSITORY_COMPILATION
libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
-libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 -export-symbols-regex '^gi?_'
+libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0
+#-export-symbols-regex '^gi?_'
gdumpdir = $(datadir)/gobject-introspection-1.0/
gdump_DATA = girepository/gdump.c
View
@@ -29,7 +29,6 @@ g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-I$(top_srcdir)/girepository
g_ir_compiler_CFLAGS = $(GIO_CFLAGS)
g_ir_compiler_LDADD = \
- libgirepository-internals.la \
libgirepository-1.0.la \
$(GIREPO_LIBS)
@@ -38,7 +37,6 @@ g_ir_generate_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-I$(top_srcdir)/girepository
g_ir_generate_CFLAGS = $(GIO_CFLAGS)
g_ir_generate_LDADD = \
- libgirepository-internals.la \
libgirepository-1.0.la \
$(GIREPO_LIBS)
View
@@ -2663,7 +2663,14 @@ parse_include (GMarkupParseContext *context,
return TRUE;
}
-extern GLogLevelFlags logged_levels;
+// was extern, moving back in the lib and protecting access to it.
+GLogLevelFlags logged_levels;
+
+
+void _g_ir_parser_set_loglevels( GLogLevelFlags new_logged_levels)
+{
+ logged_levels=new_logged_levels;
+}
static void
start_element_handler (GMarkupParseContext *context,
View
@@ -45,6 +45,9 @@ GIrModule *_g_ir_parser_parse_file (GIrParser *parser,
const gchar *filename,
GError **error);
+// TODO this was extern, moving back in the lib
+void _g_ir_parser_set_loglevels( GLogLevelFlags logged_levels);
+
G_END_DECLS
#endif /* __G_GIR_PARSER_H__ */
@@ -14,7 +14,7 @@ gitestwrite_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
gitestenum_SOURCES = $(srcdir)/gitestenum.c
gitestenum_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestenum_LDADD = $(top_builddir)/libgirepository-1.0.la $(top_builddir)/libgirepository-internals.la $(top_builddir)/libgirepository-gthash.la $(GIREPO_LIBS)
+gitestenum_LDADD = $(top_builddir)/libgirepository-1.0.la $(top_builddir)/libgirepository-gthash.la $(GIREPO_LIBS)
gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
View
@@ -115,7 +115,8 @@ write_out_typelib (gchar *prefix,
return success;
}
-GLogLevelFlags logged_levels;
+// moved out into the lib
+GLogLevelFlags logged_levels; // a copy here, and a copy in the other lib that is hidden
static void log_handler (const gchar *log_domain,
GLogLevelFlags log_level,
@@ -160,6 +161,9 @@ main (int argc, char ** argv)
logged_levels = logged_levels | G_LOG_LEVEL_DEBUG;
if (verbose)
logged_levels = logged_levels | G_LOG_LEVEL_MESSAGE;
+
+ _g_ir_parser_set_loglevels( logged_levels);
+
g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
g_log_set_default_handler (log_handler, NULL);

0 comments on commit 9dc11f8

Please sign in to comment.