Rename pkg-config name to gobject-introspection-1.0, Do not installed

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.

svn path=/trunk/; revision=277

diff --git a/ChangeLog b/ChangeLog
index 0935ab4..3ff5e54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 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.
+
+2008-05-31  Johan Dahlin  <jdahlin@async.com.br>
+
        * giscanner/giscannermodule.c (symbol_get_ident): Prevent
        a crash when symbol->indent is NULL.
 

diff --git a/Makefile.am b/Makefile.am
index 94207a5..b761c60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ DIST_SUBDIRS = m4 $(SUBDIRS)
 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

diff --git a/configure.ac b/configure.ac
index e691cf5..3d4b98f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,5 +106,5 @@ AC_CONFIG_FILES([Makefile
                  tests/Makefile
                  tests/invoke/Makefile
                  tests/parser/Makefile
-                 gobject-introspection.pc])
+                 gobject-introspection-1.0.pc])
 AC_OUTPUT

diff --git a/girepository/Makefile.am b/girepository/Makefile.am
index 74e5ada..e95b3cd 100644 (file)
--- a/girepository/Makefile.am
+++ b/girepository/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/gcov.mak
 
 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_SOURCES =                  \
 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)

diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in
new file mode 100644 (file)
index 0000000..75569b8
--- /dev/null
+++ b/gobject-introspection-1.0.pc.in
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+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@

diff --git a/gobject-introspection.pc.in b/gobject-introspection.pc.in
deleted file mode 100644 (file)
index 34f368b..0000000
--- a/gobject-introspection.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-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
-
-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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 785d70d..8e0f002 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 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_SOURCES = generate.c
 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