Fixed `make distcheck'

2008-10-16 Armin Burgmeier <[email protected]> * libinfinity/Makefile.am: * libinfinity/common/Makefile.am: * libinfinity/adopted/Makefile.am: * libinfinity/client/Makefile.am: * libinfinity/server/Makefile.am: * libinfinity/methods/local-central/Makefile.am: * libinftext/Makefile.am: * libinfgtk/Makefile.am: * libinftextgtk/Makefile.am: * infinoted/Makefile.am: * infinoted/note-plugins/text/Makefile.am: * test/Makefile.am: Moved -I$(top_srcdir) from AM_CPPFLAGS to $lib_CPPFLAGS, because the former is not used when the latter is present. This is required for `make distcheck'. * docs/reference/Makefile.am: Added version.xml.in to EXTRA_DIST. * docs/reference/libinfinity/Makefile.am: * docs/reference/libinftext/Makefile.am: * docs/reference/libinfgtk/Makefile.am: * docs/reference/libinftextgtk/Makefile.am: Added ../version.xml to content_files, to fix `make distcheck'. * docs/reference/libinfinity/libinfinity-docs.sgml: Reordered documentation sections.
pkern · Oct 16, 2008 · c179081 · c179081
1 parent 0b9fe57
commit c179081
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 68 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,31 @@
+2008-10-16  Armin Burgmeier  <[email protected]>
+
+	* libinfinity/Makefile.am:
+	* libinfinity/common/Makefile.am:
+	* libinfinity/adopted/Makefile.am:
+	* libinfinity/client/Makefile.am:
+	* libinfinity/server/Makefile.am:
+	* libinfinity/methods/local-central/Makefile.am:
+	* libinftext/Makefile.am:
+	* libinfgtk/Makefile.am:
+	* libinftextgtk/Makefile.am:
+	* infinoted/Makefile.am:
+	* infinoted/note-plugins/text/Makefile.am:
+	* test/Makefile.am: Moved -I$(top_srcdir) from AM_CPPFLAGS to
+	$lib_CPPFLAGS, because the former is not used when the latter is
+	present. This is required for `make distcheck'.
+
+	* docs/reference/Makefile.am: Added version.xml.in to EXTRA_DIST.
+
+	* docs/reference/libinfinity/Makefile.am:
+	* docs/reference/libinftext/Makefile.am:
+	* docs/reference/libinfgtk/Makefile.am:
+	* docs/reference/libinftextgtk/Makefile.am: Added ../version.xml to
+	content_files, to fix `make distcheck'.
+
+	* docs/reference/libinfinity/libinfinity-docs.sgml: Reordered
+	documentation sections.
+
 2008-10-16  Armin Burgmeier  <[email protected]>
 
 	* libinfinity/common/inf-tcp-connection.c: Make sure that calling

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = libinfinity libinftext libinfgtk libinftextgtk
+
+EXTRA_DIST = version.xml.in
diff --git a/docs/reference/libinfgtk/Makefile.am b/docs/reference/libinfgtk/Makefile.am
@@ -58,7 +58,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files = \
+	../version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/docs/reference/libinfinity/Makefile.am b/docs/reference/libinfinity/Makefile.am
@@ -67,7 +67,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files = \
+	../version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/docs/reference/libinfinity/libinfinity-docs.sgml b/docs/reference/libinfinity/libinfinity-docs.sgml
@@ -20,66 +20,66 @@
     <xi:include href="xml/inf-init.xml"/>
     <xi:include href="xml/inf-session.xml"/>
     <xi:include href="xml/inf-user-table.xml"/>
-    <xi:include href="xml/inf-buffer.xml"/>
-    <xi:include href="xml/inf-io.xml"/>
-    <xi:include href="xml/inf-standalone-io.xml"/>
-    <xi:include href="xml/inf-connection-manager.xml"/>
-    <xi:include href="xml/inf-net-object.xml"/>
-    <xi:include href="xml/inf-local-publisher.xml"/>
-    <xi:include href="xml/inf-tcp-connection.xml"/>
-    <xi:include href="xml/inf-method-manager.xml"/>
-    <xi:include href="xml/inf-discovery-avahi.xml"/>
     <xi:include href="xml/inf-user.xml"/>
     <xi:include href="xml/inf-discovery.xml"/>
-    <xi:include href="xml/inf-xmpp-manager.xml"/>
+    <xi:include href="xml/inf-local-publisher.xml"/>
+    <xi:include href="xml/inf-ip-address.xml"/>
+    <xi:include href="xml/inf-tcp-connection.xml"/>
     <xi:include href="xml/inf-xml-connection.xml"/>
-    <xi:include href="xml/inf-simulated-connection.xml"/>
     <xi:include href="xml/inf-xmpp-connection.xml"/>
-    <xi:include href="xml/inf-ip-address.xml"/>
+    <xi:include href="xml/inf-simulated-connection.xml"/>
+    <xi:include href="xml/inf-discovery-avahi.xml"/>
+    <xi:include href="xml/inf-xmpp-manager.xml"/>
+    <xi:include href="xml/inf-io.xml"/>
+    <xi:include href="xml/inf-standalone-io.xml"/>
+    <xi:include href="xml/inf-connection-manager.xml"/>
+    <xi:include href="xml/inf-method-manager.xml"/>
+    <xi:include href="xml/inf-central-method.xml"/>
+    <xi:include href="xml/inf-net-object.xml"/>
     <xi:include href="xml/inf-certificate-chain.xml"/>
     <xi:include href="xml/inf-xml-util.xml"/>
     <xi:include href="xml/inf-cert-util.xml"/>
     <xi:include href="xml/inf-error.xml"/>
-    <xi:include href="xml/inf-central-method.xml"/>
+    <xi:include href="xml/inf-buffer.xml"/>
   </chapter>
 
   <chapter>
     <title>Infinote adOPTed implementation</title>
-    <xi:include href="xml/inf-adopted-state-vector.xml"/>
     <xi:include href="xml/inf-adopted-session.xml"/>
-    <xi:include href="xml/inf-adopted-user.xml"/>
-    <xi:include href="xml/inf-adopted-session-record.xml"/>
     <xi:include href="xml/inf-adopted-algorithm.xml"/>
-    <xi:include href="xml/inf-adopted-request.xml"/>
     <xi:include href="xml/inf-adopted-request-log.xml"/>
+    <xi:include href="xml/inf-adopted-request.xml"/>
     <xi:include href="xml/inf-adopted-operation.xml"/>
-    <xi:include href="xml/inf-adopted-split-operation.xml"/>
     <xi:include href="xml/inf-adopted-no-operation.xml"/>
+    <xi:include href="xml/inf-adopted-split-operation.xml"/>
+    <xi:include href="xml/inf-adopted-user.xml"/>
+    <xi:include href="xml/inf-adopted-state-vector.xml"/>
+    <xi:include href="xml/inf-adopted-session-record.xml"/>
   </chapter>
 
   <chapter>
     <title>Infinote client side API</title>
     <xi:include href="xml/infc-browser.xml"/>
+    <xi:include href="xml/infc-browser-iter.xml"/>
+    <xi:include href="xml/infc-note-plugin.xml"/>
+    <xi:include href="xml/infc-session-proxy.xml"/>
     <xi:include href="xml/infc-explore-request.xml"/>
     <xi:include href="xml/infc-node-request.xml"/>
-    <xi:include href="xml/infc-request-manager.xml"/>
-    <xi:include href="xml/infc-session-proxy.xml"/>
-    <xi:include href="xml/infc-request.xml"/>
     <xi:include href="xml/infc-user-request.xml"/>
-    <xi:include href="xml/infc-browser-iter.xml"/>
-    <xi:include href="xml/infc-note-plugin.xml"/>
+    <xi:include href="xml/infc-request.xml"/>
+    <xi:include href="xml/infc-request-manager.xml"/>
   </chapter>
 
   <chapter>
     <title>Infinote server side API</title>
-    <xi:include href="xml/infd-xmpp-server.xml"/>
-    <xi:include href="xml/infd-server-pool.xml"/>
     <xi:include href="xml/infd-directory.xml"/>
-    <xi:include href="xml/infd-xml-server.xml"/>
-    <xi:include href="xml/infd-tcp-server.xml"/>
+    <xi:include href="xml/infd-note-plugin.xml"/>
     <xi:include href="xml/infd-storage.xml"/>
-    <xi:include href="xml/infd-session-proxy.xml"/>
     <xi:include href="xml/infd-filesystem-storage.xml"/>
-    <xi:include href="xml/infd-note-plugin.xml"/>
+    <xi:include href="xml/infd-session-proxy.xml"/>
+    <xi:include href="xml/infd-tcp-server.xml"/>
+    <xi:include href="xml/infd-xml-server.xml"/>
+    <xi:include href="xml/infd-xmpp-server.xml"/>
+    <xi:include href="xml/infd-server-pool.xml"/>
   </chapter>
 </book>
diff --git a/docs/reference/libinftext/Makefile.am b/docs/reference/libinftext/Makefile.am
@@ -58,7 +58,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files = \
+	../version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/docs/reference/libinftextgtk/Makefile.am b/docs/reference/libinftextgtk/Makefile.am
@@ -58,7 +58,8 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files = \
+	../version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/infinoted/Makefile.am b/infinoted/Makefile.am
@@ -7,7 +7,6 @@ plugin_path = ${libdir}/infinoted/note-plugins
 
 infinoted_CPPFLAGS = \
 	-I${top_srcdir} \
-	-I${top_builddir} \
 	$(infinoted_CFLAGS) \
 	$(infinity_CFLAGS) \
 	-DPLUGIN_PATH=\"${plugin_path}\"

diff --git a/infinoted/note-plugins/text/Makefile.am b/infinoted/note-plugins/text/Makefile.am
@@ -5,8 +5,7 @@ plugindir = ${libdir}/infinoted/note-plugins
 # I don't know how to achieve this, though.
 
 libinfd_note_plugin_text_la_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I${top_builddir} \
+	-I$(top_srcdir) \
 	$(infinoted_CFLAGS) \
 	$(inftext_CFLAGS) \
 	$(infinity_CFLAGS)

diff --git a/libinfgtk/Makefile.am b/libinfgtk/Makefile.am
@@ -1,16 +1,15 @@
 lib_LTLIBRARIES = libinfgtk-1.0.la
 
-AM_CPPFLAGS = -I${top_srcdir}
-
 libinfgtk_1_0_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infgtk_CFLAGS) \
 	$(infinity_CFLAGS)
 
 libinfgtk_1_0_la_LDFLAGS = \
 	-no-undefined
 
 libinfgtk_1_0_la_LIBADD = \
-	${top_srcdir}/libinfinity/libinfinity-1.0.la \
+	${top_builddir}/libinfinity/libinfinity-1.0.la \
 	$(infgtk_LIBS) \
 	$(infinity_LIBS)
 

diff --git a/libinfinity/Makefile.am b/libinfinity/Makefile.am
@@ -2,9 +2,8 @@ SUBDIRS = common adopted server client . methods
 
 lib_LTLIBRARIES = libinfinity-1.0.la
 
-AM_CPPFLAGS = -I${top_srcdir}
-
 libinfinity_1_0_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS)
 
 libinfinity_1_0_la_LDFLAGS = \

diff --git a/libinfinity/adopted/Makefile.am b/libinfinity/adopted/Makefile.am
@@ -1,6 +1,5 @@
-AM_CPPFLAGS = -I${top_srcdir}
-
 libinfinity_adopted_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS)
 
 noinst_LTLIBRARIES = libinfinity_adopted.la

diff --git a/libinfinity/client/Makefile.am b/libinfinity/client/Makefile.am
@@ -1,8 +1,7 @@
-AM_CPPFLAGS = -I${top_srcdir}
-
 noinst_LTLIBRARIES = libinfinity_client.la
 
 libinfinity_client_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS)
 
 libinfinity_client_ladir = $(includedir)/libinfinity-1.0/libinfinity/client

diff --git a/libinfinity/common/Makefile.am b/libinfinity/common/Makefile.am
@@ -1,8 +1,7 @@
-AM_CPPFLAGS = -I${top_srcdir}
-
 methods_base = infinote/method-plugins
 
 libinfinity_common_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS) \
 	$(avahi_CFLAGS) \
 	-DMETHODS_LIBDIR=\"${libdir}\" \

diff --git a/libinfinity/methods/local-central/Makefile.am b/libinfinity/methods/local-central/Makefile.am
@@ -17,8 +17,7 @@ methodsdir = ${libdir}/infinote/method-plugins
 # I don't know how to achieve this, though.
 
 libinf_method_local_central_la_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I${top_builddir} \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS)
 
 libinf_method_local_central_la_LDFLAGS = \

diff --git a/libinfinity/server/Makefile.am b/libinfinity/server/Makefile.am
@@ -1,8 +1,7 @@
-AM_CPPFLAGS = -I${top_srcdir}
-
 noinst_LTLIBRARIES = libinfinity_server.la
 
 libinfinity_server_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(infinity_CFLAGS)
 
 libinfinity_server_ladir = $(includedir)/libinfinity-1.0/libinfinity/server

diff --git a/libinftext/Makefile.am b/libinftext/Makefile.am
@@ -1,16 +1,15 @@
 lib_LTLIBRARIES = libinftext-1.0.la
 
-AM_CPPFLAGS = -I${top_srcdir}
-
 libinftext_1_0_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(inftext_CFLAGS) \
 	$(infinity_CFLAGS)
 
 libinftext_1_0_la_LDFLAGS = \
 	-no-undefined
 
 libinftext_1_0_la_LIBADD = \
-	${top_srcdir}/libinfinity/libinfinity-1.0.la \
+	${top_builddir}/libinfinity/libinfinity-1.0.la \
 	$(inftext_LIBS) \
 	$(infinity_LIBS)
 

diff --git a/libinftextgtk/Makefile.am b/libinftextgtk/Makefile.am
@@ -1,8 +1,7 @@
 lib_LTLIBRARIES = libinftextgtk-1.0.la
 
-AM_CPPFLAGS = -I${top_srcdir}
-
 libinftextgtk_1_0_la_CPPFLAGS = \
+	-I$(top_srcdir) \
 	$(inftextgtk_CFLAGS) \
 	$(inftext_CFLAGS) \
 	$(infinity_CFLAGS)
@@ -11,8 +10,8 @@ libinftextgtk_1_0_la_LDFLAGS = \
 	-no-undefined
 
 libinftextgtk_1_0_la_LIBADD = \
-	${top_srcdir}/libinftext/libinftext-1.0.la \
-	${top_srcdir}/libinfinity/libinfinity-1.0.la \
+	${top_builddir}/libinftext/libinftext-1.0.la \
+	${top_builddir}/libinfinity/libinfinity-1.0.la \
 	$(inftextgtk_LIBS) \
 	$(inftext_LIBS) \
 	$(infinity_LIBS)

diff --git a/po/de.po b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: infinote 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-16 20:51+0200\n"
+"POT-Creation-Date: 2008-10-16 21:43+0200\n"
 "PO-Revision-Date: 2008-09-17 21:58+0200\n"
 "Last-Translator:  <[email protected]>\n"
 "Language-Team: German\n"
@@ -505,27 +505,27 @@ msgstr ""
 msgid "No such user with ID %u"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:660
+#: libinfinity/common/inf-connection-manager.c:663
 #, c-format
 msgid "Publisher ID of connection '%s' is already known"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:678
+#: libinfinity/common/inf-connection-manager.c:681
 #, c-format
 msgid "Publisher ID '%s' has incorrect length"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:727
+#: libinfinity/common/inf-connection-manager.c:730
 #, c-format
 msgid "Publisher ID '%s' is already in use"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:802
+#: libinfinity/common/inf-connection-manager.c:805
 #, c-format
 msgid "Received unexpected message '%s'"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:920
+#: libinfinity/common/inf-connection-manager.c:923
 #, c-format
 msgid ""
 "Request from %s caused error: %s\n"
@@ -538,7 +538,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libinfinity/common/inf-connection-manager.c:986
+#: libinfinity/common/inf-connection-manager.c:989
 #, c-format
 msgid "Received bad XML request from %s: %s"
 msgstr ""
@@ -805,13 +805,13 @@ msgstr ""
 msgid "Received unhandled XML message '%s'"
 msgstr ""
 
-#: libinfinity/common/inf-tcp-connection.c:562
+#: libinfinity/common/inf-tcp-connection.c:560
 #, c-format
 msgid "Interface `%s' does not exist"
 msgstr ""
 
 #. Failed to get name for device <Index>: <Reason>
-#: libinfinity/common/inf-tcp-connection.c:637
+#: libinfinity/common/inf-tcp-connection.c:635
 #, c-format
 msgid "Failed to get name for device %u: %s"
 msgstr ""

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = util session cleanup
 
 AM_CPPFLAGS = \
 	-I${top_srcdir} \
-	-I${top_builddir} \
 	${infinity_CFLAGS}
 
 if WITH_INFGTK
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		SUBDIRS = libinfinity libinftext libinfgtk libinftextgtk

		EXTRA_DIST = version.xml.in