Update

2007-12-09  Johan Dahlin  <johan@gnome.org>

	* TODO: Update

	* src/Makefile.am: Rename gen-introspect to g-idl-scanner,
	don't make the repository library and the other utilites link against
	gthread-2.0

svn path=/trunk/; revision=73

diff --git a/TODO b/TODO
index 4b51eab..5e8306d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 XML format
 ----------
 - Document the format
-- Write a scanner to create XML from annotated headers
 - Add attributes to connect signals to their default handlers
   and wrappers to their vfuncs
 - Add a way to specify default values
@@ -31,6 +30,11 @@ Repository
   libraries/metadata files
 - Fix extra indirection for out parameters in invoke
 
+Scanner
+-------
+- Annotations
+- More tests
+
 General
 -------
 - More tests

diff --git a/configure.ac b/configure.ac
index 9639532..15ce3b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,11 @@ AC_CHECK_LIB([dl], [dlopen])
 
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 
+PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0])
+
 LIBFFI_DEP=""
 AC_SUBST(LIBFFI_DEP)
-PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 libffi],
+PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 libffi],
                   [have_libffi=true], [have_libffi=false])
 
 if $have_libffi; then
@@ -40,7 +42,7 @@ if $have_libffi; then
 else
    dnl if libffi is not found, g_function_info_invoke is not available,
    dnl but everything else still works
-   PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0])
+   PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0])
 fi
 
 # Checks for header files.

diff --git a/src/Makefile.am b/src/Makefile.am
index d861fb0..0356fcd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
+BUILT_SOURCES = cparser.h
+AM_YFLAGS = -d
 
+noinst_LTLIBRARIES = libgirepository-parser.la
 lib_LTLIBRARIES = libgirepository.la
-bin_PROGRAMS = g-idl-compiler g-idl-generate gen-introspect
-
+bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
 
 libgirepository_la_SOURCES =                   \
        girepository.c                          \
@@ -13,35 +15,27 @@ libgirepository_la_SOURCES =                        \
        ginvoke.c
 libgirepository_la_CFLAGS = $(GIREPO_CFLAGS)
 
-
-g_idl_compiler_SOURCES =                       \
-       gidlparser.c                            \
+libgirepository_parser_la_SOURCES =            \
        gidlmodule.c                            \
        gidlnode.c                              \
-       gmetadata.c                             \
-       compiler.c      
-g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS)
-g_idl_compiler_LDADD = $(GIREPO_LIBS)
+       gidlparser.c
+libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS)
 
+g_idl_compiler_SOURCES = compiler.c    
+g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS)
+g_idl_compiler_LDADD = $(GIREPO_LIBS) libgirepository.la libgirepository-parser.la
 
 g_idl_generate_SOURCES = generate.c
 g_idl_generate_CFLAGS = $(GIREPO_CFLAGS)
 g_idl_generate_LDADD = $(GIREPO_LIBS) libgirepository.la
 
-girepodir = $(includedir)/glib-2.0/gobject-introspection
-girepo_HEADERS = girepository.h
-
-BUILT_SOURCES = cparser.h
-AM_YFLAGS = -d
-
-gen_introspect_SOURCES =                       \
+g_idl_scanner_SOURCES =                                \
        clexer.l                                \
        cparser.y                               \
-       gidlmodule.c                            \
-       gidlnode.c                              \
-       gidlparser.c                            \
        gen-introspect.c                        \
        gen-introspect.h
-gen_introspect_CFLAGS = $(GIREPO_CFLAGS)
-gen_introspect_LDADD = $(GIREPO_LIBS) libgirepository.la
+g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS)
+g_idl_scanner_LDADD = $(GIREPO_LIBS) $(SCANNER_LIBS) libgirepository.la libgirepository-parser.la
 
+girepodir = $(includedir)/glib-2.0/gobject-introspection
+girepo_HEADERS = girepository.h

diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index f76250b..3b9d170 100644 (file)
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -11,8 +11,8 @@ libfoo_la_LIBADD = $(GOBJECT_LIBS)
 BUILT_SOURCES = Foo.gidl
 CLEANFILES = Foo.gidl
 
-Foo.gidl: libfoo.la foo-object.h $(top_builddir)/src/gen-introspect
-       $(top_builddir)/src/gen-introspect --namespace=Foo \
+Foo.gidl: libfoo.la foo-object.h $(top_builddir)/src/g-idl-scanner
+       $(top_builddir)/src/g-idl-scanner --namespace=Foo \
        --include-idl=$(top_srcdir)/gidl/GLib.gidl \
        `pwd`/foo-object.h -I. -U__GNUC__ $(GOBJECT_CFLAGS) \
        libfoo.la > $@