GNOME.org
 

[baobab] Fix up a few things in the build system after the split.

commit 0aad5b123ec4153917ba1bb20809bc314354c869
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Oct 15 17:40:05 2011 +0200

    Fix up a few things in the build system after the split.

 .gitignore          |    9 ---
 ChangeLog           |    2 +
 Makefile.am         |   39 ++++++++++-
 NEWS                |    4 +
 autogen.sh          |    5 +-
 configure.ac        |   54 ++++++---------
 data/Makefile.am    |    2 +
 git.mk              |  200 +++++++++++++++++++++++++++++++++++++++++++++++++++
 help/Makefile.am    |    2 +
 pixmaps/Makefile.am |    2 +
 src/Makefile.am     |    1 +
 11 files changed, 275 insertions(+), 45 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..35b2282
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+The ChangeLog is autogenerated when creating the release.
+If you are seeing this, use git log for viewing the list of changes.
diff --git a/Makefile.am b/Makefile.am
index 58feaee..dcfc603 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,40 @@
 SUBDIRS =  src data pixmaps help po
 
-EXTRA_DIST = COPYING.docs
\ No newline at end of file
+EXTRA_DIST = COPYING.docs
+
+MAINTAINERCLEANFILES = 		\
+	aclocal.m4		\
+	config.guess		\
+	config.h.in		\
+	config.sub		\
+	depcomp			\
+	gnome-doc-utils.make	\
+	INSTALL			\
+	install-sh		\
+	ltmain.sh		\
+	missing			\
+	m4/gnome-doc-utils.m4	\
+	m4/intltool.m4		\
+	m4/libtool.m4		\
+	m4/lt~obsolete.m4	\
+	m4/ltoptions.m4		\
+	m4/ltsugar.m4		\
+	m4/ltversion.m4		\
+	omf.make		\
+	xmldocs.make
+
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		(GIT_DIR=$(top_srcdir)/.git \
+		  ./missing --run git log --stat -M -C --name-status  --date=short --no-color) | \
+		  fmt --split-only > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		  echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..9a93f12
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,4 @@
+3.3.0
+=====
+
+ * First release a standalone module after gnome-utils was split
diff --git a/autogen.sh b/autogen.sh
index 208897d..0bb0f63 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,12 +4,13 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="GNOME Utilities"
+PKG_NAME="baobab"
 
 (test -f $srcdir/configure.ac \
+  && test -f $srcdir/README \
   && test -f $srcdir/src/baobab.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level baobab directory"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
diff --git a/configure.ac b/configure.ac
index 95c101b..41865f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,35 +1,28 @@
 dnl -*- mode: m4 -*-
 AC_PREREQ(2.63)
-AC_INIT([baobab],[3.3.0],[],[baobab])
+
+AC_INIT([baobab],[3.3.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=baobab],[baobab])
 
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_SRCDIR(src/baobab.c)
 AC_CONFIG_MACRO_DIR([m4])
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
 AC_CANONICAL_TARGET
 
-# require automake 1.10
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability])
+AM_MAINTAINER_MODE([enable])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
 IT_PROG_INTLTOOL(0.40.0)
-PKG_PROG_PKG_CONFIG([0.22])
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
 
-## don't rerun to this point if we abort
-AC_CACHE_SAVE
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
 
 AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_ISC_POSIX
-AC_HEADER_STDC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG([0.22])
 
 # no stupid static libraries
 AM_DISABLE_STATIC
@@ -44,13 +37,11 @@ GLIB_GSETTINGS
 
 GNOME_DOC_INIT
 
-GLIB_MIN_VERSION=2.28.0
-GTK_MIN_VERSION=3.0.0
-
-PKG_CHECK_MODULES(BAOBAB,
-                  glib-2.0 >= $GLIB_MIN_VERSION
-                  gtk+-3.0 >= $GTK_MIN_VERSION
-                  libgtop-2.0)
+PKG_CHECK_MODULES(BAOBAB, [
+    glib-2.0 >= 2.28.0
+    gtk+-3.0 >= 3.0.0
+    libgtop-2.0
+])
 
 AC_CONFIG_FILES([
 Makefile
@@ -63,14 +54,11 @@ po/Makefile.in
 
 AC_OUTPUT
 
-dnl ==========================================================================
 echo "
+    Baobab $VERSION
 
-        Baobab $VERSION
-        ===============
-
-        prefix:    ${prefix}
-        compiler:  ${CC}
+    prefix:    ${prefix}
+    compiler:  ${CC}
 
-        Now type 'make' to build $PACKAGE
+    Now type 'make' to build $PACKAGE
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 6dee008..919f6df 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -32,3 +32,5 @@ CLEANFILES =	 			\
 	$(baobabapp_in_files)		\
 	$(baobabapp_DATA)		\
 	$(gsettings_SCHEMAS)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, mallard, intltool, gsettings.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	$(AM_V_GEN) \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for x in \
+				$(_DOC_C_DOCS) \
+				$(_DOC_LC_DOCS) \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(_DOC_POFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+			for x in \
+				$(gsettings_SCHEMAS:.xml=.valid) \
+				$(gsettings__enum_file) \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				po/$(GETTEXT_PACKAGE).pot \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) \
+			$(check_PROGRAMS) \
+			$(EXTRA_PROGRAMS) \
+			$(LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+			".dirstamp" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LC_ALL=C sort | uniq > $  tmp && \
+	mv $  tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/help/Makefile.am b/help/Makefile.am
index 78cdfc8..b559f19 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -6,3 +6,5 @@ DOC_ENTITIES = legal.xml
 DOC_INCLUDES =
 
 DOC_LINGUAS = ca cs da de el en_GB es eu fi fr it oc pl pt_BR ru sl sv uk zh_CN zh_HK zh_TW
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 2f43a95..38614cf 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -67,3 +67,5 @@ uninstall-icons:
 install-data-local: install-icons update-icon-cache
 
 uninstall-local: uninstall-icons update-icon-cache
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 555709e..e9c7ccd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,3 +46,4 @@ baobab_LDADD = 				\
 	$(BAOBAB_LIBS)			\
 	$(NULL)
 
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]