GNOME.org
 

[libgdamm] Begin transition to mm-common build system

commit 355dda2d711c04df23c0db9aeab0ea043b1185e5
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 14:19:10 2009 +0200

    Begin transition to mm-common build system
    
    * autogen.sh: Replace with minimal version using mm-common-prepare
    and autoreconf.
    * configure.ac: Rename file from configure.in.  Remove a lot of old
    cruft and clean up the remaining bits.  Make use of mm-common macros.
    Insert temporary dummy conditionals to keep the module buildable.
    * Makefile.am (ACLOCAL_AMFLAGS): Set to help autoreconf do its work.
    (SUBDIRS): Remove scripts/ subdirectory.
    (DIST_SUBDIRS): Remove.
    * scripts/Makefile.am: Delete obsolete build file.
    * scripts/macros.m4: Delete obsolete Autoconf macro file.
    * build/: New directory for auxiliary build files.

 .gitignore                         |   25 +++++
 ChangeLog                          |   16 +++
 INSTALL                            |  182 --------------------------------
 Makefile.am                        |   21 ++++-
 autogen.sh                         |   64 +-----------
 build/.gitignore                   |   11 ++
 configure.ac                       |   77 ++++++++++++++
 configure.in                       |  200 ------------------------------------
 libgda/libgdamm/.gitignore         |   11 ++
 libgda/libgdamm/private/.gitignore |    1 +
 scripts/Makefile.am                |    3 -
 scripts/macros.m4                  |   65 ------------
 12 files changed, 167 insertions(+), 509 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9af2014
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+Makefile
+Makefile.in
+.dirstamp
+.deps/
+.libs/
+*.[ao]
+*.l[ao]
+stamp-h?
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/config.log
+/config.status
+/config.status.lineno
+/configure
+/configure.lineno
+/libtool
+/libgdamm-*.tar.*
+/docs/reference/Doxyfile
+/docs/reference/html/
+/examples/*/example
+/libgda/libgdamm-*.pc
+/libgda/libgdammconfig.h
+/libgda/src/.stamps/
+/tools/extra_defs_gen/generate_extra_defs
diff --git a/ChangeLog b/ChangeLog
index d67d520..edc482a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
+	Begin transition to mm-common build system
+
+	* autogen.sh: Replace with minimal version using mm-common-prepare
+	and autoreconf.
+	* configure.ac: Rename file from configure.in.  Remove a lot of old
+	cruft and clean up the remaining bits.  Make use of mm-common macros.
+	Insert temporary dummy conditionals to keep the module buildable.
+	* Makefile.am (ACLOCAL_AMFLAGS): Set to help autoreconf do its work.
+	(SUBDIRS): Remove scripts/ subdirectory.
+	(DIST_SUBDIRS): Remove.
+	* scripts/Makefile.am: Delete obsolete build file.
+	* scripts/macros.m4: Delete obsolete Autoconf macro file.
+	* build/: New directory for auxiliary build files.
+
 2009-07-30  Johannes Schmid <jschmid openismus com>
 
 	* libgda/src/set.hg: Fix add_holder() template to work with 
diff --git a/Makefile.am b/Makefile.am
index cd832c7..de3f968 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,24 @@
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of libgdamm.
+##
+## libgdamm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## libgdamm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
+
 SUBDIRS		= tools libgda docs examples
-DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \
 		  build_shared/Makefile_build.am_fragment \
diff --git a/autogen.sh b/autogen.sh
index a67c156..fed2c5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,59 +1,7 @@
-#!/bin/sh
-MAKE=`which gnumake`
-if test ! -x "$MAKE" ; then MAKE=`which gmake` ; fi
-if test ! -x "$MAKE" ; then MAKE=`which make` ; fi
-HAVE_GNU_MAKE=`$MAKE --version|grep -c "Free Software Foundation"`
-
-if test "$HAVE_GNU_MAKE" != "1"; then 
-echo !!!! ERROR: You need GNU make to build from cvs!; 
-echo !!!! $MAKE is not GNU make;
-exit 1; 
-fi
-
-echo Found GNU Make at $MAKE ... good.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="libgdamm"
-
-(test -f $srcdir/configure.in \
-  && test -d $srcdir/libgda/src \
-  && test -d $srcdir/libgda/libgdamm) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-
-
-echo "Adding libtools."
-libtoolize --automake
-
-echo "Building macros."
-aclocal -I scripts $ACLOCAL_FLAGS
-
-#echo "Building config header."
-#autoheader
-
-echo "Building makefiles."
-automake   --add-missing
-
-echo "Building configure."
-autoconf
-
-rm -f config.cache
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-
-    echo "Running configure."
-    ./configure --enable-maintainer-mode "$@"
-    echo
-    echo 'run "make"'
-    echo
-else
-    echo
-    echo 'run "./configure ; make"'
-    echo
-fi
+#! /bin/sh -e
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
+mm-common-prepare --force --copy "$srcdir"
+autoreconf --force --install "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..7b13ff1
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,11 @@
+/compile-binding.am
+/config.*
+/depcomp
+/dist-changelog.am
+/doc-reference.am
+/generate-binding.am
+/install-sh
+/libtool.m4
+/lt*.m4
+/ltmain.sh
+/missing
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..61de00f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,77 @@
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of libgdamm.
+##
+## libgdamm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## libgdamm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+AC_INIT([libgdamm], [3.99.16], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgdamm],
+        [libgdamm], [http://www.gtkmm.org/])
+AC_PREREQ([2.59])
+
+AC_CONFIG_SRCDIR([libgda/libgdamm.h])
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build])
+AC_CONFIG_HEADERS([build/config.h libgda/libgdammconfig.h])
+
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([LIBGDAMM_SO_VERSION], [11:0:0])
+
+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
+AM_MAINTAINER_MODE
+AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+
+AC_PROG_CXX
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_SUBST([LIBGDAMM_MODULES], ['glibmm-2.4 >= 2.12.8 libgda-4.0 >= 4.0.0'])
+PKG_CHECK_MODULES([LIBGDAMM], [$LIBGDAMM_MODULES])
+
+PKG_CHECK_EXISTS([libgda-bdb-4.0], [libgdamm_have_bdb=yes], [libgdamm_have_bdb=no])
+AS_IF([test "x$libgdamm_have_bdb" = xyes],
+      [AC_DEFINE([HAVE_BDB], [1], [Define if the libgda-bdb plugin is available.])])
+AM_CONDITIONAL([HAVE_BDB], [test "x$libgdamm_have_bdb" = xyes])
+
+MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
+
+# Temporary dummies
+AC_SUBST([GMM_PROCDIR], ['$(GMMPROC_DIR)'])
+AC_SUBST([GMM_PROC], ['$(GMMPROC_DIR)/gmmproc'])
+AM_CONDITIONAL([BUILD_REFERENCE], [false])
+AM_CONDITIONAL([PLATFORM_WIN32], [false])
+
+AC_CONFIG_FILES([
+  Makefile
+
+  libgda/Makefile
+  libgda/libgdamm-4.0.pc
+  libgda/src/Makefile
+  libgda/libgdamm/Makefile
+  libgda/libgdamm/private/Makefile
+
+  tools/Makefile
+    tools/extra_defs_gen/Makefile
+    tools/m4/Makefile
+
+  docs/Makefile
+  docs/reference/Makefile
+    docs/reference/Doxyfile
+
+  examples/Makefile
+    examples/simple/Makefile
+  examples/config/Makefile
+])
+AC_OUTPUT
diff --git a/libgda/libgdamm/.gitignore b/libgda/libgdamm/.gitignore
new file mode 100644
index 0000000..5535580
--- /dev/null
+++ b/libgda/libgdamm/.gitignore
@@ -0,0 +1,11 @@
+/*.cc
+!/init.cc
+!/throw_exception.cc
+!/utilities.cc
+!/value.cc
+/*.h
+!/init.h
+!/throw_exception.h
+!/utilities.h
+!/value.h
+!/wrap_init.h
diff --git a/libgda/libgdamm/private/.gitignore b/libgda/libgdamm/private/.gitignore
new file mode 100644
index 0000000..0cb5a60
--- /dev/null
+++ b/libgda/libgdamm/private/.gitignore
@@ -0,0 +1 @@
+/*_p.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]