GNOME.org
 

[dasher] Spring cleaning of Makefile.am and friends.

commit 78ae381b7008c1fdbab56fed20bd4f52c97e93ac
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Sun May 17 00:20:54 2009 +0100

    Spring cleaning of Makefile.am and friends.
---
 ChangeLog                    |   13 +++++-
 Data/Help/Gnome/omf.make     |   53 -----------------------
 Data/Help/Gnome/xmldocs.make |   96 ------------------------------------------
 Makefile.am                  |   26 ++----------
 configure.ac                 |   14 +++---
 5 files changed, 23 insertions(+), 179 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd3382d..9cbe697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-05-16  Patrick Welche  <prlw1 cam ac uk>
+
+	* Makefile.am, configure.ac: Don't delete gnome-doc-utils.make
+	whose m4 file already sets --disable-scrollkeeper, use
+	cached variable for gdu, NEWS is dealt with by gnu, we
+	don't distribute Expat, there is no configure.ac in Src/Test,
+	and gnome still likes distributing gzipped source archives.
+	It seems that make distcheck requires an internet connection
+	as as gnome-doc-utils' xmllint hunts for scrollkeeper-omf.dtd
+	at scrollkeeper.sf.net. Remove unused {omf,xmldocs}.make
+	from Data/Help?Gnome.
+
 2009-05-15  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* Backport to OS X 10.4 universal binary for PPC.
@@ -6,7 +18,6 @@
 	Refactored computation of polar co-ordinates for auto speed
 	control.
 
-
 2009-05-14  Patrick Welche  <prlw1 cam ac uk>
 
 	* DasherButtons.cpp: Change box non-uniformity range again.
diff --git a/Data/Help/Gnome/omf.make b/Data/Help/Gnome/omf.make
deleted file mode 100644
index fc7e298..0000000
--- a/Data/Help/Gnome/omf.make
+++ /dev/null
@@ -1,53 +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/lib
-# 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/lib, 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 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)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-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 $(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 $(scrollkeeper_localstate_dir)
diff --git a/Data/Help/Gnome/xmldocs.make b/Data/Help/Gnome/xmldocs.make
deleted file mode 100644
index 1b1ab01..0000000
--- a/Data/Help/Gnome/xmldocs.make
+++ /dev/null
@@ -1,96 +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)/@PACKAGE@/doc/$(docname)/$(lang)
-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
-
-# If the following file is in a subdir (like help/) you need to add that to the path
-include $(top_srcdir)/Data/Help/Gnome/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)
-
diff --git a/Makefile.am b/Makefile.am
index e8e86fd..10f9db0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,10 @@ distuninstallcheck_listfiles = \
 		grep -v '^\./var/scrollkeeper' | \
 		grep -v '^\./share/gnome/help'
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 EXTRA_DIST = \
 		INSTALL.Linux \
 		INSTALL.WinCE \
 		INSTALL.Windows \
-		NEWS \
 		MAINTAINERS \
 		gnome-doc-utils.make \
 		m4 \
@@ -22,7 +19,6 @@ EXTRA_DIST = \
 		intltool-update.in
 
 DISTCLEANFILES = \
-		gnome-doc-utils.make \
 		m4 \
 		intltool-merge \
 		intltool-extract \
@@ -37,6 +33,7 @@ MAINTAINERCLEANFILES = \
 		$(srcdir)/compile \
 		$(srcdir)/config.guess \
 		$(srcdir)/config.h.in \
+		$(srcdir)/config.h.in~ \
 		$(srcdir)/config.sub \
 		$(srcdir)/configure \
 		$(srcdir)/configure.scan \
@@ -50,22 +47,7 @@ MAINTAINERCLEANFILES = \
 		$(srcdir)/intltool-update.in \
 		$(srcdir)/omf.make \
 		$(srcdir)/xmldocs.make \
-		$(srcdir)/po/Makefile.in.in \
-		$(srcdir)/Src/Test/COPYING \
-		$(srcdir)/Src/Test/INSTALL \
-		$(srcdir)/Src/Test/aclocal.m4 \
-		$(srcdir)/Src/Test/config.guess \
-		$(srcdir)/Src/Test/config.h.in \
-		$(srcdir)/Src/Test/config.sub \
-		$(srcdir)/Src/Test/configure \
-		$(srcdir)/Src/Test/depcomp \
-		$(srcdir)/Src/Test/install-sh \
-		$(srcdir)/Src/Test/missing \
-		$(srcdir)/Src/Test/mkinstalldirs \
-		$(srcdir)/Src/Test/Makefile.in \
-		$(srcdir)/Src/Test/omf.make \
-		$(srcdir)/Src/Test/xmldocs.make \
-		`find "$(srcdir)" -regex '.*/Src/Common/Expat' -prune -o -type f -name Makefile.in -print`
+		$(srcdir)/po/Makefile.in.in
 
 maemo-install: all
 	- mkdir tmp_build
@@ -75,6 +57,6 @@ maemo-install: all
 	cp Src/Gtk2/dashermaemo.glade Src/Gtk2/dashermaemofullscreen.glade tmp_build/usr/share/dasher
 	cp Data/system.rc/training_english_GB.txt Data/system.rc/alphabet.english.xml Data/system.rc/colour.xml tmp_build/usr/share/dasher
 	ln -sf /usr/share/applications/hildon/dasher.desktop tmp_build/etc/others-menu/extra_applications/0301_dasher.desktop
-	- find tmp_build -name CVS -exec rm -rf \{\} \;
-	dpkg-deb -b tmp_build dasher_4.1.4.0inferencemaemo1_armel.deb 
+	- find tmp_build -name .git -exec rm -rf \{\} \;
+	dpkg-deb -b tmp_build dasher_4.10.1.0inferencemaemo1_armel.deb 
 	rm -rf tmp_build
diff --git a/configure.ac b/configure.ac
index f8db1de..5d9fed7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,7 @@ dnl c.f. bug #323968, but e.g. Ubuntu 8.04 LTS ships with 0.37.1
 dnl AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
-dnl The following two changes are required currently for the Maemo build (but will break the GNOME build)
-
-dnl AM_INIT_AUTOMAKE([1.9 gnu check-news dist-bzip2 no-dist-gzip])
-AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2])
 AM_MAINTAINER_MODE
 
 AC_PROG_MAKE_SET
@@ -398,13 +395,16 @@ AC_SUBST(GTK2BUILD_CFLAGS)
 AC_SUBST(GTK2BUILD_LIBS)
 
 AC_MSG_CHECKING([for gnome-doc-utils])
-GNOME_DOC_INIT([0.9.0],[have_gdu=yes],[have_gdu=no])
-AC_MSG_RESULT($have_gdu)
+dnl Avoid default action which is to complain if not found
+GNOME_DOC_INIT([0.9.0],[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
+AC_MSG_RESULT($gdu_cv_have_gdu)
 
-if test x"$WITHGNOME" = xtrue -a x"$have_gdu" = xno ; then
+if test x"$WITHGNOME" = xtrue -a x"$gdu_cv_have_gdu" = xno ; then
     AC_MSG_ERROR([gnome-doc-utils not found!])
 fi
 
+dnl XXX PRLW How is this better than the standard
+dnl gdu_cv_have_gdu && enable_scrollkeeper ?
 AM_CONDITIONAL(ENABLE_SK, test x"$WITHGNOME" = xfalse -a x"$enable_scrollkeeper" = "xyes")
 
 AC_CONFIG_FILES([Data/dasher.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]