Do not builds docs/*/Makefile. These aren't needed. Do not distribute

2007-05-14  Brian Cameron  <brian.cameron@sun.com>

        * configure.ac: Do not builds docs/*/Makefile.  These aren't needed.
        * Makefile.am: Do not distribute xmldocs.make or omf.make.
        * omf.make, xmldocs.make: Delete these files.  They aren't needed.
        * docs/*/Makefile.am:  Delete these files.  They aren't needed.
          Update to no longer use the deprecated xmldocs.make and omf.make.
          Now gnome-doc-utils.make handles everything.
        * docs/Makefile.am: No longer go into SUBDIRS.  Instead all all
          languages to DOC_LINGUAS.  Add gdm.xml to DOC_ENTITIES.

svn path=/trunk/; revision=4926

17 files changed, 14 insertions, 273 deletions

diff --git a/ChangeLog b/ChangeLog
index e956cbeb..82038e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2007-05-14  Brian Cameron  <brian.cameron@sun.com>
 
+	* configure.ac: Do not builds docs/*/Makefile.  These aren't needed.
+	* Makefile.am: Do not distribute xmldocs.make or omf.make.
+	* omf.make, xmldocs.make: Delete these files.  They aren't needed.
+	* docs/*/Makefile.am:  Delete these files.  They aren't needed.
+	  Update to no longer use the deprecated xmldocs.make and omf.make.
+	  Now gnome-doc-utils.make handles everything.
+	* docs/Makefile.am: No longer go into SUBDIRS.  Instead all all
+	  languages to DOC_LINGUAS.  Add gdm.xml to DOC_ENTITIES.
+
+2007-05-14  Brian Cameron  <brian.cameron@sun.com>
+
 	* omf.make, xmldocs.make: Bump to the latest versions from
 	  gnome-common 2.18.0.
 
diff --git a/Makefile.am b/Makefile.am
index 03d0dadb..37aa7637 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,7 @@ EXTRA_DIST = \
 	intltool-extract.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	gnome-doc-utils.make	\
-	xmldocs.make		\
-	omf.make
+	gnome-doc-utils.make
 
 DISTCLEANFILES = \
 	gnome-doc-utils.make	\
diff --git a/configure.ac b/configure.ac
index 97715738..f5b733ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1304,14 +1304,6 @@ config/Makefile
 po/Makefile.in
 common/Makefile
 docs/Makefile
-docs/de/Makefile
-docs/es/Makefile
-docs/fr/Makefile
-docs/it/Makefile
-docs/ja/Makefile
-docs/zh_CN/Makefile
-docs/zh_HK/Makefile
-docs/zh_TW/Makefile
 config/Init
 config/PreSession
 config/PostSession
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f619e57c..5c8ec457 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,14 +2,13 @@ include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = gdm
-DOC_ENTITIES = 
+DOC_ENTITIES = gdm.xml
 DOC_INCLUDES = legal.xml
 
-DOC_LINGUAS = es ko uk
+DOC_LINGUAS = de en_GB es fr it ja ko sv uk zh_CN zh_HK zh_TW
 
 # Translations need migration to use gnome-doc-utils.
 # See page http://live.gnome.org/GnomeDocUtilsTranslationMigration
-SUBDIRS = . de es fr it ja zh_CN zh_HK zh_TW
 
 man_MANS = gdm.1
 
diff --git a/docs/de/Makefile.am b/docs/de/Makefile.am
deleted file mode 100644
index 217f5a05..00000000
--- a/docs/de/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = de
-omffile = gdm-de.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/en_GB/Makefile.am b/docs/en_GB/Makefile.am
deleted file mode 100644
index 7d2e4deb..00000000
--- a/docs/en_GB/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = en_GB
-omffile = gdm-en_GB.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/es/Makefile.am b/docs/es/Makefile.am
deleted file mode 100644
index a7f934e3..00000000
--- a/docs/es/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = es
-omffile = gdm-es.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/fr/Makefile.am b/docs/fr/Makefile.am
deleted file mode 100644
index bdc73838..00000000
--- a/docs/fr/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = fr
-omffile = gdm-fr.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/it/Makefile.am b/docs/it/Makefile.am
deleted file mode 100644
index 7a8a7232..00000000
--- a/docs/it/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = it
-omffile = gdm-it.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/ja/Makefile.am b/docs/ja/Makefile.am
deleted file mode 100644
index ac207886..00000000
--- a/docs/ja/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = ja
-omffile = gdm-ja.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/sv/Makefile.am b/docs/sv/Makefile.am
deleted file mode 100644
index 779a6754..00000000
--- a/docs/sv/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = sv
-omffile = gdm-sv.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/uk/Makefile.am b/docs/uk/Makefile.am
deleted file mode 100644
index fe079520..00000000
--- a/docs/uk/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = 
-docname = gdm
-lang = uk
-omffile = gdm-uk.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/zh_CN/Makefile.am b/docs/zh_CN/Makefile.am
deleted file mode 100644
index 012144ea..00000000
--- a/docs/zh_CN/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = zh_CN
-omffile = gdm-zh_CN.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/zh_HK/Makefile.am b/docs/zh_HK/Makefile.am
deleted file mode 100644
index 3fb0342d..00000000
--- a/docs/zh_HK/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = zh_HK
-omffile = gdm-zh_HK.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/docs/zh_TW/Makefile.am b/docs/zh_TW/Makefile.am
deleted file mode 100644
index 0ad6bc6a..00000000
--- a/docs/zh_TW/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figs = \
-	figures/gdm_window.png
-figdir = figures
-docname = gdm
-lang = zh_TW
-omffile = gdm-zh_TW.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/omf.make b/omf.make
deleted file mode 100644
index cb7acbaa..00000000
--- a/omf.make
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files.  It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use 
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-#       general, there will be other documents install besides XML documents
-#       and the makefiles for these formats should also include this file.
-#
-# About this file:
-#	This file was derived from scrollkeeper_example2, a package
-#	illustrating how to install documentation and OMF files for use with
-#	ScrollKeeper 0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.3 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-# At some point, it may be wise to change to something like this:
-# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
-	-for file in $(omffile); do \
-	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done; \
-	touch omf_timestamp
-
-install-data-hook-omf:
-	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-	for file in $(omffile); do \
-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-	done
-	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
-	-for file in $(srcdir)/*.omf; do \
-		basefile=`basename $$file`; \
-		rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
-	done
-	-rmdir $(DESTDIR)$(omf_dest_dir)
-	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
-
-clean-local-omf:
-	-for file in $(omffile); do \
-		rm -f $$file.out; \
-	done
diff --git a/xmldocs.make b/xmldocs.make
deleted file mode 100644
index b93e3f33..00000000
--- a/xmldocs.make
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-#     1) Define: figdir, docname, lang, omffile, and entities in
-#        your Makefile.am file for each document directory,
-#        although figdir, omffile, and entities may be empty
-#     2) Make sure the Makefile in (1) also includes 
-#	 "include $(top_srcdir)/xmldocs.make" and
-#	 "dist-hook: app-dist-hook".
-#     3) Optionally define 'entities' to hold xml entities which
-#        you would also like installed
-#     4) Figures must go under $(figdir)/ and be in PNG format
-#     5) You should only have one document per directory 
-#     6) Note that the figure directory, $(figdir)/, should not have its
-#        own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-#   figdir = figures
-#   docname = scrollkeeper-manual
-#   lang = C
-#   omffile=scrollkeeper-manual-C.omf
-#   entities = fdl.xml
-#   include $(top_srcdir)/xmldocs.make
-#   dist-hook: app-dist-hook
-#
-# About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper 
-#	0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/
-#	Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# **********  Begin of section some packagers may need to modify  **********
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# **********  You should not have to edit below this line  **********
-xml_files = $(entities) $(docname).xml
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-include $(top_srcdir)/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
-	-ourdir=`pwd`;  \
-	cd $(srcdir);   \
-	cp $(entities) $$ourdir
-
-app-dist-hook:
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(distdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-local: omf
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for file in $(xml_files); do \
-	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-	done
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
-	-if test "$(figdir)"; then \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-	  done; \
-	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-	fi
-	-for file in $(xml_files); do \
-	  rm -f $(DESTDIR)$(docdir)/$$file; \
-	done
-	-rmdir $(DESTDIR)$(docdir)
-
-clean-local: clean-local-doc clean-local-omf
-
-# for non-srcdir builds, remove the copied entities.
-clean-local-doc:
-	if test $(srcdir) != .; then \
-	  rm -f $(entities); \
-	fi