[gxml] Fixed GIR include header generation. Moved gxml-dom.h from libgxml-1.0/gxml/ to libxml-1.0



commit 647ed07a279a8b98220422b8bd508839448179b7
Author: Daniel Espinosa Ortiz <despinosa git gnome org>
Date:   Fri Nov 18 21:13:05 2011 -0600

    Fixed GIR include header generation. Moved gxml-dom.h from libgxml-1.0/gxml/ to
    libxml-1.0
    
    * valac doesn't allows to use subdirectories in include headers in GIR generatedfile

 gxml/Makefile.am |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 8aee524..944ec63 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -86,7 +86,7 @@ include_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgxml-1.0.pc
 
-gxmlincludedir=$(includedir)/libgxml-1.0/gxml
+gxmlincludedir=$(includedir)/libgxml-1.0
 gxmlinclude_HEADERS= gxml-dom.h
 
 # GObject Introspection
@@ -103,8 +103,7 @@ endif
 INTROSPECTION_GIRS =
 INTROSPECTION_GIRS += GXmlDom-1.0.gir
 INTROSPECTION_COMPILER_ARGS = \
-    --includedir=. \
-    --includedir=$(top_builddir)/gxml 
+    --includedir=.  
 
 GXmlDom-1.0.typelib: $(INTROSPECTION_GIRS)
 	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS)  $< -o $@
@@ -115,7 +114,7 @@ typelibs_DATA = GXmlDom-1.0.typelib
 vapidir = $(VALA_VAPIDIR)
 vapi_DATA=gxmldom-1.0.vapi
 
-CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-1.0.vapi
+CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-1.0.vapi gxml-dom.h
 
 EXTRA_DIST = \
 	libgxml-1.0.pc.in \



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