gobject-introspection r277 - in trunk: . girepository tools

[johan svn gnome org]

Author: johan
Date: Sat May 31 20:49:42 2008
New Revision: 277
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=277&view=rev

Log:
2008-05-31  Johan Dahlin  <jdahlin async com br>

    * Makefile.am:
    * configure.ac:
    * girepository/Makefile.am:
    * giscanner/transformer.py:
    * gobject-introspection-1.0.pc.in:
    * gobject-introspection.pc.in:
    * tools/Makefile.am:

    Rename pkg-config name to gobject-introspection-1.0,
    Do not installed anything which is not using the gir format.
    Disable compililation the old C scanner, but still keep the source
    until all the remaning functionallity has been ported.



Added:
   trunk/gobject-introspection-1.0.pc.in
      - copied, changed from r273, /trunk/gobject-introspection.pc.in
Removed:
   trunk/gobject-introspection.pc.in
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/girepository/Makefile.am
   trunk/tools/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat May 31 20:49:42 2008
@@ -6,7 +6,7 @@
 man_MANS = docs/g-ir-scanner.1
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gobject-introspection.pc
+pkgconfig_DATA = gobject-introspection-1.0.pc
 EXTRA_DIST = $(pkgconfig_DATA)
 
 if GI_GCOV_ENABLED

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat May 31 20:49:42 2008
@@ -106,5 +106,5 @@
                  tests/Makefile
                  tests/invoke/Makefile
                  tests/parser/Makefile
-                 gobject-introspection.pc])
+                 gobject-introspection-1.0.pc])
 AC_OUTPUT

Modified: trunk/girepository/Makefile.am
==============================================================================
--- trunk/girepository/Makefile.am	(original)
+++ trunk/girepository/Makefile.am	Sat May 31 20:49:42 2008
@@ -4,7 +4,7 @@
 
 INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
 
-lib_LTLIBRARIES = libgirepository.la
+noinst_LTLIBRARIES = libgirepository.la
 
 libgirepository_la_SOURCES =			\
 	girepository.c				\
@@ -15,7 +15,8 @@
 libgirepository_la_CPPFLAGS = $(GIREPO_CFLAGS)
 libgirepository_la_LIBADD = $(GIREPO_LIBS)
 
-girepodir = $(includedir)/glib-2.0/gobject-introspection
-girepo_HEADERS = girepository.h
+#girepodir = $(includedir)/gobject-introspection-1.0/
+#girepo_HEADERS = girepository.h
+noinst_HEADERS = girepository.h
 
 GCOVSOURCES = $(libgirepository_la_SOURCES)

Copied: trunk/gobject-introspection-1.0.pc.in (from r273, /trunk/gobject-introspection.pc.in)
==============================================================================
--- /trunk/gobject-introspection.pc.in	(original)
+++ trunk/gobject-introspection-1.0.pc.in	Sat May 31 20:49:42 2008
@@ -4,13 +4,15 @@
 bindir= bindir@
 includedir= includedir@
 
-g_idl_generator=${bindir}/g-idl-generator
-g_idl_scanner=${bindir}/g-idl-scanner
-g_idl_compiler=${bindir}/g-idl-compiler
+g_ir_scanner=${bindir}/g-ir-scanner
+
+# FIXME: These needs to be ported to the GIR format first
+# g_idl_generator=${bindir}/g-idl-generator
+# g_idl_compiler=${bindir}/g-idl-compiler
+# Cflags: -I${includedir}/gobject-introspection-1.0
+# Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
+# Libs: -L${libdir} -lgirepository
 
 Name: gobject-introspection
 Description: GObject Introspection
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${libdir} -lgirepository
-Cflags: -I${includedir}/glib-2.0/gobject-introspection

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Sat May 31 20:49:42 2008
@@ -8,7 +8,7 @@
 EXTRA_DIST = g-ir-scanner
 
 noinst_LTLIBRARIES = libgirepository-parser.la
-bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
+noinst_PROGRAMS = g-idl-compiler g-idl-generate
 bin_SCRIPTS = g-ir-scanner
 
 libgirepository_parser_la_SOURCES =		\
@@ -28,23 +28,9 @@
 g_idl_generate_CFLAGS = $(GIREPO_CFLAGS)
 g_idl_generate_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
 
-g_idl_scanner_SOURCES =				\
-	scanner.c				\
-	scanner.h				\
-	gidlwriter.c				\
-	gidlwriter.h
-g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS)
-g_idl_scanner_LDADD = \
-	$(GIREPO_LIBS) \
-	$(SCANNER_LIBS) \
-	$(top_builddir)/girepository/libgirepository.la \
-	$(top_builddir)/giscanner/libgiscanner.la \
-	libgirepository-parser.la
-
 GCOVSOURCES =					\
 	$(libgirepository_la_SOURCES)		\
 	$(g_idl_compiler_SOURCES)		\
-	$(g_idl_generate_SOURCES)		\
-	$(g_idl_scanner_SOURCES)
+	$(g_idl_generate_SOURCES)
 
 include $(top_srcdir)/gcov.mak