GNOME.org
 

[librsvgmm] Transition to the build files from mm-common

commit 742a69340972c306eb473eff1229026c7288e80c
Author: Daniel Elstner <danielk openismus com>
Date:   Tue Aug 11 02:13:33 2009 +0200

    Transition to the build files from mm-common
    
    * autogen.sh: Invoke mm-common-prepare.
    * Makefile.am: Do not distribute build/doc-install.pl.
    * build/*: Delete build support files which are in mm-common now.
    * doc/reference/doxytag_to_devhelp2.xsl: Remove file.
    * configure.ac (AM_INIT_AUTOMAKE): Switch to pax archive format.
    (MM_ARG_WITH_TAGFILE_DOC): Change to new tag file names.
    * doc/Makefile.am: Remove documentation utility overrides.
    (dist_noinst_DATA): Stop distributing doxytag_to_devhelp2.xsl.
    * doc/Doxyfile.in (EXPAND_AS_DEFINED): List version number macros.
    * librsvg/librsvgmm-2.0-uninstalled.pc.in: Use @PACKAGE_VERSION@
    instead of @LIBRSVGMM_VERSION@ for simplicity.
    * librsvg/librsvgmm-2.0.pc.in: ditto.
    (datadir): Substitute configuration value, just in case.
    * librsvg/librsvgmm/Makefile.am (librsvgmm_2_0_la_LDFLAGS): Add
    -no-undefined flag unconditionally.
    * librsvg/librsvgmm/filelist.am: Avoid $(var:%=%) substitution to
    preemptively avoid the Automake problems encountered in glibmm.
    * librsvg/src/filelist.am: ditto.

 Makefile.am                             |    1 -
 autogen.sh                              |    1 +
 build/.gitignore                        |    4 +
 build/compile-binding.am                |   60 ---------
 build/dist-changelog.am                 |   32 -----
 build/dk-warn.m4                        |   91 --------------
 build/doc-install.pl                    |  207 -------------------------------
 build/doc-reference.am                  |  146 ----------------------
 build/generate-binding.am               |   76 -----------
 build/mm-doc.m4                         |  158 -----------------------
 build/mm-module.m4                      |   67 ----------
 build/mm-pkg.m4                         |   40 ------
 configure.ac                            |   10 +-
 doc/Makefile.am                         |    5 -
 doc/reference/Doxyfile.in               |    6 +-
 doc/reference/doxytag_to_devhelp2.xsl   |   79 ------------
 librsvg/librsvgmm-2.0-uninstalled.pc.in |    4 +-
 librsvg/librsvgmm-2.0.pc.in             |    5 +-
 librsvg/librsvgmm/Makefile.am           |    2 +-
 librsvg/librsvgmm/filelist.am           |   11 +-
 librsvg/src/filelist.am                 |    2 +-
 21 files changed, 27 insertions(+), 980 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9d887bc..14b5283 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,6 @@ doc_subdirs =
 endif
 SUBDIRS = $(src_subdirs) librsvg/librsvgmm $(doc_subdirs)
 
-dist_noinst_DATA = build/doc-install.pl
 dist_noinst_SCRIPTS = autogen.sh
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/autogen.sh b/autogen.sh
index ed45c1b..fed2c5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,5 +2,6 @@
 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
index 4b5cf18..0590391 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,6 +1,10 @@
 /compile
+/compile-binding.am
 /config.*
 /depcomp
+/dist-changelog.am
+/doc-reference.am
+/generate-binding.am
 /install-sh
 /libtool.m4
 /lt*.m4
diff --git a/configure.ac b/configure.ac
index a6aaa8c..1908a1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([build/config.h])
 
 # The ustar format supports longer filenames
-AM_INIT_AUTOMAKE([1.10 -Wno-portability check-news no-define nostdinc tar-ustar])
+AM_INIT_AUTOMAKE([1.10 -Wno-portability check-news no-define nostdinc tar-pax])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
@@ -45,13 +45,13 @@ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
 MM_ARG_ENABLE_DOCUMENTATION
-MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag])
-MM_ARG_WITH_TAGFILE_DOC([libsigc_doxygen_tags], [sigc++-2.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm_doxygen_tags],  [glibmm-2.4])
+MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
+MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 MM_ARG_WITH_TAGFILE_DOC([cairomm_doxygen_tags], [cairomm-1.0])
 
 AC_LANG([C++])
-DK_ARG_ENABLE_WARNINGS([LIBRSVGMM_WXXFLAGS],
+MM_ARG_ENABLE_WARNINGS([LIBRSVGMM_WXXFLAGS],
                        [-Wall],
                        [-pedantic -Wall -Wextra],
                        [G RSVG])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 609e846..9e30a6d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,9 +21,4 @@ include $(top_srcdir)/librsvg/librsvgmm/filelist.am
 book_name = $(LIBRSVGMM_MODULE_NAME)
 doc_input = $(addprefix $(top_srcdir)/librsvg/librsvgmm/,$(files_built_h))
 
-doc_install = $(top_srcdir)/build/doc-install.pl
-doxytag_to_devhelp2 = $(srcdir)/reference/doxytag_to_devhelp2.xsl
-
 include $(top_srcdir)/build/doc-reference.am
-
-dist_noinst_DATA += reference/doxytag_to_devhelp2.xsl
diff --git a/doc/reference/Doxyfile.in b/doc/reference/Doxyfile.in
index d2f96eb..54525d4 100644
--- a/doc/reference/Doxyfile.in
+++ b/doc/reference/Doxyfile.in
@@ -230,13 +230,15 @@ INCLUDE_PATH           = "@abs_top_builddir@/librsvg" \
 INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED             = __cplusplus \
                          DOXYGEN_SHOULD_SKIP_THIS \
-                         G_GNUC_CONST= \
+                         "G_GNUC_CONST=" \
                          GLIBMM_VFUNCS_ENABLED \
                          GLIBMM_PROPERTIES_ENABLED \
                          GLIBMM_EXCEPTIONS_ENABLED \
                          GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED \
                          GTKMM_ATKMM_ENABLED
-EXPAND_AS_DEFINED      =
+EXPAND_AS_DEFINED      = LIBRSVGMM_MAJOR_VERSION \
+                         LIBRSVGMM_MINOR_VERSION \
+                         LIBRSVGMM_MICRO_VERSION
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
diff --git a/librsvg/librsvgmm-2.0-uninstalled.pc.in b/librsvg/librsvgmm-2.0-uninstalled.pc.in
index 22a288d..4de7aa4 100644
--- a/librsvg/librsvgmm-2.0-uninstalled.pc.in
+++ b/librsvg/librsvgmm-2.0-uninstalled.pc.in
@@ -3,8 +3,8 @@ htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html
 
 Name: librsvgmm
 Description: C++ binding for librsvg, not installed
-Version: @LIBRSVGMM_VERSION@
+Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
 Requires: @LIBRSVGMM_MODULES@
-Libs: ${pc_top_builddir}/${pcfiledir}/librsvgmm/@LIBRSVGMM_MODULE_NAME  la
+Libs: ${pc_top_builddir}/${pcfiledir}/librsvgmm/librsvgmm- LIBRSVGMM_API_VERSION@.la
 Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/librsvg/librsvgmm-2.0.pc.in b/librsvg/librsvgmm-2.0.pc.in
index 58b2ef6..bb15e40 100644
--- a/librsvg/librsvgmm-2.0.pc.in
+++ b/librsvg/librsvgmm-2.0.pc.in
@@ -1,8 +1,9 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@
 datarootdir= datarootdir@
+datadir= datadir@
+includedir= includedir@
 
 docdir=${datarootdir}/doc/@LIBRSVGMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@LIBRSVGMM_MODULE_NAME  tag
@@ -11,7 +12,7 @@ htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html
 
 Name: librsvgmm
 Description: C++ binding for librsvg
-Version: @LIBRSVGMM_VERSION@
+Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
 Requires: @LIBRSVGMM_MODULES@
 Libs: -L${libdir} -lrsvgmm- LIBRSVGMM_API_VERSION@
diff --git a/librsvg/librsvgmm/Makefile.am b/librsvg/librsvgmm/Makefile.am
index 6c5d95a..d490750 100644
--- a/librsvg/librsvgmm/Makefile.am
+++ b/librsvg/librsvgmm/Makefile.am
@@ -25,5 +25,5 @@ AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(LIBRSV
 AM_CXXFLAGS = $(LIBRSVGMM_WXXFLAGS)
 
 librsvgmm_2_0_la_SOURCES = $(binding_sources)
-librsvgmm_2_0_la_LDFLAGS = -version-info $(LIBRSVGMM_SO_VERSION)
+librsvgmm_2_0_la_LDFLAGS = -no-undefined -version-info $(LIBRSVGMM_SO_VERSION)
 librsvgmm_2_0_la_LIBADD  = $(LIBRSVGMM_LIBS)
diff --git a/librsvg/librsvgmm/filelist.am b/librsvg/librsvgmm/filelist.am
index 3a69e48..88f86a5 100644
--- a/librsvg/librsvgmm/filelist.am
+++ b/librsvg/librsvgmm/filelist.am
@@ -1,7 +1,8 @@
 ## This file is part of librsvgmm.
 
-files_built_cc	= $(files_hg:.hg=.cc) wrap_init.cc
-files_built_h	= $(files_hg:.hg=.h)
-files_built_ph	= $(files_hg:%.hg=private/%_p.h)
-files_extra_cc	=
-files_extra_h	= wrap_init.h
+files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
+files_built_h  = $(files_hg:.hg=.h)
+files_built_ph = $(patsubst %.hg,private/%_p.h,$(files_hg))
+files_extra_cc =
+files_extra_h  = wrap_init.h
+files_extra_ph =
diff --git a/librsvg/src/filelist.am b/librsvg/src/filelist.am
index 99eb06f..8a3ff0d 100644
--- a/librsvg/src/filelist.am
+++ b/librsvg/src/filelist.am
@@ -9,4 +9,4 @@ files_defs =			\
 	librsvg_docs_override.xml
 
 files_hg  = rsvg.hg
-files_ccg = $(files_hg:%.hg=%.ccg)
+files_ccg = $(files_hg:.hg=.ccg)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]