[Xfce4-commits] [xfce/libxfce4ui] 01/04: fix: make distcheck

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

e   r   i   c       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 4b5a29c11467d6d8cf6a226c30faa541909ea3a1
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sat Jun 24 11:57:27 2017 +0300

    fix: make distcheck
---
 .gitignore                    |  1 -
 docs/Makefile.am              |  7 -------
 docs/libxfce4ui-docs.xml      | 10 ----------
 libxfce4ui/Makefile.am        |  8 ++------
 libxfce4ui/libxfce4ui.symbols |  1 -
 libxfce4ui/xfce-dialogs.c     |  4 ----
 6 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index a383ecb..e390580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ libxfce4kbd-private/libxfce4kbd-private-3.pc
 libxfce4ui/libxfce4ui-1.pc
 libxfce4ui/libxfce4ui-2.pc
 libxfce4ui/libxfce4ui-config.h
-libxfce4ui/libxfce4ui-dialog-ui.h
 libxfce4ui/libxfce4ui-dialog-ui.ui~
 libxfce4ui/libxfce4ui-resources.c
 libxfce4ui/libxfce4ui-resources.h
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c737565..3e9ddae 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -66,13 +66,6 @@ include $(top_srcdir)/gtk-doc.make
 EXTRA_DIST +=								\
 	version.xml.in
 
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
-endif
-
 # required for gtk-doc
 dist-hook: all
 
diff --git a/docs/libxfce4ui-docs.xml b/docs/libxfce4ui-docs.xml
index 60a2f12..28a705e 100644
--- a/docs/libxfce4ui-docs.xml
+++ b/docs/libxfce4ui-docs.xml
@@ -8,9 +8,6 @@
 <!ENTITY xfce-dialogs SYSTEM "xml/xfce-dialogs.xml">
 <!ENTITY xfce-titled-dialog SYSTEM "xml/xfce-titled-dialog.xml">
 <!ENTITY xfce-sm-client SYSTEM "xml/xfce-sm-client.xml">
-<!ENTITY api-index-full SYSTEM "xml/api-index-full.xml">
-<!ENTITY annotation-glossary SYSTEM "xml/annotation-glossary.xml">
-<!ENTITY api-index-deprecated SYSTEM "xml/api-index-deprecated.xml">
 
 <!ENTITY version SYSTEM "version.xml">
 <!ENTITY date "May 2017">
@@ -79,13 +76,6 @@
     <title>Xfce Session Management Support</title>
     &xfce-sm-client;
   </part>
-
-  <index>
-    <title>Index</title>
-    &api-index-full;
-    &annotation-glossary;
-    &api-index-deprecated;
-  </index>
 </book>
 
 <!--
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index 7fee732..fca91ec 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -225,14 +225,10 @@ LIBXFCE4UI_RESOURCE_FILES = \
 	$(NULL)
 
 libxfce4ui_built_sources += \
-	libxfce4ui-resources.c \
-	libxfce4ui-resources.h
+	libxfce4ui-resources.c
 
 libxfce4ui-resources.c: libxfce4ui.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name libxfce4ui $(srcdir)/libxfce4ui.gresource.xml
-
-libxfce4ui-resources.h: libxfce4ui.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name libxfce4ui $(srcdir)/libxfce4ui.gresource.xml
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --internal --c-name libxfce4ui $(srcdir)/libxfce4ui.gresource.xml
 
 endif
 
diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
index a4bf4ae..bd87d5f 100644
--- a/libxfce4ui/libxfce4ui.symbols
+++ b/libxfce4ui/libxfce4ui.symbols
@@ -40,7 +40,6 @@
 libxfce4ui_major_version
 libxfce4ui_minor_version
 libxfce4ui_micro_version
-libxfce4ui_get_resource
 #endif
 libxfce4ui_check_version
 #endif
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index a95fb65..a89db80 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -54,10 +54,6 @@
 #include <libxfce4ui/libxfce4ui-private.h>
 #include <libxfce4ui/libxfce4ui-alias.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include "libxfce4ui-resources.h"
-#endif
-
 
 static void
 xfce_dialog_show_help_auto_toggled (GtkWidget *button)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.