conglomerate r2170 - in trunk: . data dispspecs doc/reference uss

[nshmyrev svn gnome org]

Author: nshmyrev
Date: Sun Jul 27 22:58:44 2008
New Revision: 2170
URL: http://svn.gnome.org/viewvc/conglomerate?rev=2170&view=rev

Log:
2008-07-28  Geert Stappers <stappers stappers nl>

	Patch on the way to make distcheck



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/ChangeLog
   trunk/data/Makefile.am
   trunk/dispspecs/ChangeLog
   trunk/dispspecs/Makefile.am
   trunk/doc/reference/ChangeLog
   trunk/doc/reference/Makefile.am
   trunk/uss/ChangeLog
   trunk/uss/mkcvstarball

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jul 27 22:58:44 2008
@@ -2,22 +2,35 @@
 
 NULL =
 
+INTLTOOL_FILES = \
+  intltool-extract.in \
+  intltool-merge.in \
+  intltool-update.in \
+  $(NULL)
+
 EXTRA_DIST = BUGS	\
-  README.xml            \
+  README.xml		\
   .diffexclude		\
   conglomerate.spec.in	\
   intltool-extract.in	\
   intltool-merge.in	\
   intltool-update.in	\
   omf.make              \
-  xmldocs.make          \
+  xmldocs.make		\
+  $(INTLTOOL_FILES)	\
   $(NULL)
 
-## # when we switch to automake1.7, we will need this:
-##distuninstallcheck_listfiles = find . \
-##   -type f -print | \
-##   grep -v '^\./var/scrollkeeper' | \
-##   grep -v '^\./share/gnome/help/conglomerate/C/faq.xml'
-## # but it will need more to get a fine `make distcheck`
+DISTCLEANFILES = \
+  intltool-extract \
+  intltool-merge \
+  intltool-update \
+  $(NULL)
+
+DISTCHECK_CONFIGURE_FLAGS = \
+  --disable-schemas-install \
+  --disable-scrollkeeper \
+  --enable-gtk-doc \
+  $(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
+# files to skip during `make dist`
+distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
\ No newline at end of file

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jul 27 22:58:44 2008
@@ -21,7 +21,7 @@
 AC_PROG_INSTALL
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
-AC_PROG_INTLTOOL([0.30])
+AC_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sun Jul 27 22:58:44 2008
@@ -45,3 +45,9 @@
 	$(schema_DATA)			\
 	$(schema_in_files)		\
 	$(NULL)
+
+DISTCLEANFILES = \
+	$(desktop_DATA)	\
+	$(schema_DATA) \
+	$(keys_DATA)
+

Modified: trunk/dispspecs/Makefile.am
==============================================================================
--- trunk/dispspecs/Makefile.am	(original)
+++ trunk/dispspecs/Makefile.am	Sun Jul 27 22:58:44 2008
@@ -43,4 +43,9 @@
 	$(dtd_DATA) \
 	$(NULL)
 
+DISTCLEANFILES = \
+	$(dispspec_DATA) \
+	$(dtd_DATA) \
+	$(NULL)
+
 ## end of this Makefile.am

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Sun Jul 27 22:58:44 2008
@@ -1,5 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
+# We require automake 1.6 at least.
+AUTOMAKE_OPTIONS = 1.6
+
 # See the GTK+ Makefiles in gtk+/docs/reference for examples
 # of using the various options.
 
@@ -49,9 +52,6 @@
 	      	$(GTKSOURCEVIEW_LIBS) $(ENCHANT_LIBS) $(PRINTING_LIBS) \
 		$(filter-out ../../src/main.o,$(wildcard ../../src/*.o))
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
-
 # If you need to override some of the declarations, place them in the
 # $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
 DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt

Modified: trunk/uss/mkcvstarball
==============================================================================
--- trunk/uss/mkcvstarball	(original)
+++ trunk/uss/mkcvstarball	Sun Jul 27 22:58:44 2008
@@ -1,7 +1,18 @@
 #!/bin/bash
+# make cvs tarball
+# script to make a tarball from the version control source tree (CVS, SVN, etc)
+# it exists because the generated Makefiles do many check which aren't passed 
+# With the cheats in this script is a `make dist` possible
 
 # temporary modified files
-TMPMOD="configure.in ChangeLog"
+TMPMOD="configure.ac ChangeLog"
+
+# intltool isn't yet configured right
+for intfile in extract merge update
+do
+  if=intltool-${intfile}.in
+  [ ! -f ${if} ] && touch ${if}
+done
 
 # preserve
 for TM in ${TMPMOD}
@@ -16,10 +27,10 @@
   ( date -R; echo "This is prelease ${1}"; echo; cat ChangeLog.tm ) > ChangeLog
   sed -e "s/^AC_INIT(\(.*\), \(.*\))/AC_INIT(\1, \2pre${1})/" \
       -e "/doc\/reference/d" \
-    configure.in.tm > configure.in
+    configure.ac.tm > configure.ac
 else
   sed -e "/doc\/reference/d" \
-    configure.in.tm > configure.in
+    configure.ac.tm > configure.ac
 fi
 
 # don't spent time on the poor gtk-doc stuff
@@ -34,8 +45,9 @@
 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes make distcheck
 if [ $? -ne 0 ]
 then
+ echo *********************
  echo make distcheck failed
- exit 1
+ echo *********************
 fi
 
 # restore the temporary modified files