[caribou/ricotz/vala: 4/5] Stop patching the generated GIR




commit c52ce71c49dc8d6109a58d16cc8d491d7bd1d781
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Jan 20 22:59:49 2021 +0100

    Stop patching the generated GIR

 libcaribou/Makefile.am |  8 ++------
 tools/Makefile.am      |  1 -
 tools/fix_gir.py       | 53 --------------------------------------------------
 3 files changed, 2 insertions(+), 60 deletions(-)
---
diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
index 05f2774..0634374 100644
--- a/libcaribou/Makefile.am
+++ b/libcaribou/Makefile.am
@@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \
        --pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
        --pkg libxklavier --pkg external-libs \
        --internal-vapi caribou-internals-1.0.vapi \
-       --library caribou-1.0 --gir _Caribou-1.0.gir \
+       --library caribou-1.0 --gir Caribou-1.0.gir \
        --symbols libcaribou.symbols \
        $(VALAFLAGS)
 
@@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = Caribou-1.0.typelib
 
-Caribou-1.0.gir: _Caribou-1.0.gir
-       $(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@
-
 Caribou-1.0.typelib: Caribou-1.0.gir
        @INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
 
@@ -81,8 +78,7 @@ CLEANFILES = \
        caribou-1.0.vapi \
        caribou-internals-1.0.vapi \
        Caribou-1.0.typelib \
-       Caribou-1.0.gir \
-       _Caribou-1.0.gir
+       Caribou-1.0.gir
 
 DISTCLEANFILES = \
        caribou-1.0.pc
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3a9bcdb..89f753d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST = \
-       fix_gir.py \
        make_schema.py \
        convert_cldr.py \
        basic.xsl


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]