From 5aa4cf05ee3182cf06ccfdf1def96817f0f80eaf Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 22 Jan 2019 16:12:29 +0100
Subject: Support 'make distcheck'.

---
 Makefile.am     | 13 +++++++++++--
 po/librda.pot   | 10 +++++-----
 src/Makefile.am | 12 +++++-------
 src/rda.c       |  1 -
 src/rda_ogon.c  |  1 -
 src/rda_ogon.h  |  1 -
 src/rda_x2go.c  |  1 -
 src/rda_x2go.h  |  1 -
 8 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c655e5a..c7848ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,25 @@
+NULL =
+
 SUBDIRS = data src util po
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 if WANT_TESTS
 
-SUBDIRS += \
-        tests
+SUBDIRS +=				\
+        tests				\
+        $(NULL)
 
 tests: librda
 
 endif
 
+DISTCHECK_CONFIGURE_FLAGS =		\
+    --enable-x2go			\
+    --enable-ogon			\
+    --disable-silent-rules		\
+    --enable-introspection		\
+    $(NULL)
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
diff --git a/po/librda.pot b/po/librda.pot
index d9c1068..207e433 100644
--- a/po/librda.pot
+++ b/po/librda.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-19 01:49+0100\n"
+"POT-Creation-Date: 2019-01-22 16:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rda.c:100
+#: ../src/rda.c:99
 msgid "local"
 msgstr ""
 
-#: ../src/rda.c:116
+#: ../src/rda.c:115
 msgid "unknown"
 msgstr ""
 
-#: ../src/rda_x2go.c:50
+#: ../src/rda_x2go.c:49
 msgid "X2Go"
 msgstr ""
 
-#: ../src/rda_ogon.c:50
+#: ../src/rda_ogon.c:49
 msgid "OgonRDP"
 msgstr ""
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 11c05a8..849f8d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,14 +17,12 @@ CLEANFILES += $(st_file)
 EXTRA_DIST += $(st_file).in
 BUILT_SOURCES += $(st_file)
 
-rda_headers =				\
-	rda_supported_technologies.h	\
-	rda.h				\
-	$(NULL)
-
 librdaincludedir = $(includedir)/rda
 librdainclude_HEADERS =			\
-	$(rda_headers)			\
+	rda_supported_technologies.h	\
+	rda_ogon.h			\
+	rda_x2go.h			\
+	rda.h				\
 	$(NULL)
 
 librda_la_SOURCES =			\
@@ -56,7 +54,7 @@ introspection_sources = $(librdainclude_HEADERS)	\
 
 rda-1.0.gir: librda.la
 rda_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0
-rda_1_0_gir_CFLAGS = $(librda_la_CFLAGS)
+rda_1_0_gir_CFLAGS = $(librda_la_CFLAGS) -I$(srcdir)
 rda_1_0_gir_LIBS = librda.la
 rda_1_0_gir_FILES = $(introspection_sources)
 
diff --git a/src/rda.c b/src/rda.c
index c1aa449..63e9294 100644
--- a/src/rda.c
+++ b/src/rda.c
@@ -21,7 +21,6 @@
    Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/src/rda_ogon.c b/src/rda_ogon.c
index d435e27..95f4f11 100644
--- a/src/rda_ogon.c
+++ b/src/rda_ogon.c
@@ -21,7 +21,6 @@
    Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/src/rda_ogon.h b/src/rda_ogon.h
index fa1cfb8..744d459 100644
--- a/src/rda_ogon.h
+++ b/src/rda_ogon.h
@@ -24,7 +24,6 @@
 #ifndef RDA_OGON_H
 #define RDA_OGON_H
 
-#include <config.h>
 #include <glib.h>
 
 #include <rda.h>
diff --git a/src/rda_x2go.c b/src/rda_x2go.c
index c47b066..7b8cb6c 100644
--- a/src/rda_x2go.c
+++ b/src/rda_x2go.c
@@ -21,7 +21,6 @@
    Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/src/rda_x2go.h b/src/rda_x2go.h
index c1a0f1e..5759e79 100644
--- a/src/rda_x2go.h
+++ b/src/rda_x2go.h
@@ -24,7 +24,6 @@
 #ifndef RDA_X2GO_H
 #define RDA_X2GO_H
 
-#include <config.h>
 #include <glib.h>
 
 #include <rda.h>
-- 
cgit v1.2.3