[libvtemm] Changed build system to use mm-common. It is yet untested.

From: Krzesimir Nowak <krnowak src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [libvtemm] Changed build system to use mm-common. It is yet untested.
Date: Wed, 19 Aug 2009 22:01:50 +0000 (UTC)
commit e2dcfbea93d9db385e4dc4e83daa521f7f21e36e
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Tue Aug 18 00:24:16 2009 +0200

    Changed build system to use mm-common. It is yet untested.
    
    * Makefile.am:
    * configure.ac:
    * autogen.sh:
    * codegen/Makefile.am:
    * docs/Makefile.am:
    * docs/reference/Doxyfile.in:
    * examples/Makefile.am:
    * libvte/libvtemm-1.2.pc.in:
    * libvte/libvtemm/Makefile.am:
    * libvte/libvtemmconfig.h.in:
    * libvte/src/Makefile.am: Adapted/overhauled to new build system.
    * codegen/extradefs/generate_defs_vte.cc: Renamed to
    `codegen/extradefs/generate_extra_defs_libvte.cc'.
    * codegen/m4/filelist.am: Changed variable name from obsolete
    `files_tools_m4' to `files_codegen_m4'.
    * docs/reference/libvtemm_footer.html_fragment: Closed a <div> tag.
    Corrected a year.
    * libvte/libvtemm-1.2-uninstalled.pc.in:
    * libvte/libvtemm/filelist.am:
    * libvte/libvtemm/libvte/src/filelist.am:
    * old_news_and_changelogs/filelist.am: Added.
    * docs/reference/Makefile.am:
    * docs/reference/README:
    * examples/Makefile.am_fragment:
    * examples/README:
    * examples/gettexter/Makefile.am:
    * examples/simple/Makefile.am:
    * libvte/src/Makefile_defs.am_fragment:
    * libvte/src/Makefile_list_of_hg.am_fragment:
    * old_news_and_changelogs/Makefile.am: Deleted obsolete/useless
    files.

 Makefile.am                                        |   69 ++++----
 autogen.sh                                         |   22 +--
 codegen/Makefile.am                                |   16 ++-
 ...e_defs_vte.cc => generate_extra_defs_libvte.cc} |    0
 codegen/m4/filelist.am                             |    2 +-
 configure.ac                                       |  191 +++++---------------
 docs/Makefile.am                                   |   17 +-
 docs/reference/Doxyfile.in                         |  131 ++++++++------
 docs/reference/Makefile.am                         |   86 ---------
 docs/reference/README                              |    6 -
 docs/reference/libvtemm_footer.html_fragment       |    5 +-
 examples/Makefile.am                               |   26 +++-
 examples/Makefile.am_fragment                      |   12 --
 examples/README                                    |    2 -
 examples/gettexter/Makefile.am                     |   10 -
 examples/simple/Makefile.am                        |   10 -
 libvte/libvtemm-1.2-uninstalled.pc.in              |    9 +
 libvte/libvtemm-1.2.pc.in                          |   19 ++-
 libvte/libvtemm/Makefile.am                        |   28 ++--
 libvte/libvtemm/filelist.am                        |   30 +++
 libvte/libvtemmconfig.h.in                         |   14 +-
 libvte/src/Makefile.am                             |   19 +--
 libvte/src/Makefile_defs.am_fragment               |    5 -
 libvte/src/Makefile_list_of_hg.am_fragment         |    8 -
 libvte/src/filelist.am                             |   13 ++
 old_news_and_changelogs/Makefile.am                |    7 -
 old_news_and_changelogs/filelist.am                |   10 +
 27 files changed, 308 insertions(+), 459 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9f613d8..6a7f369 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,44 @@
 ## Copyright (c) 2008, 2009
 ## The libvtemm development team. (based on libgdamm development team's work)
 
-SUBDIRS = tools src docs examples
-DIST_SUBDIRS = $(SUBDIRS) scripts old_news_and_changelogs
+ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
-ACLOCAL_AMFLAGS = -I scripts
+if MAINTAINER_MODE
+src_subdirs = codegen libvte/src
+else
+src_subdirs =
+endif
+if ENABLE_DOCUMENTATION
+doc_subdirs = doc
+else
+doc_subdirs =
+endif
 
-EXTRA_DIST = build_shared/Makefile_shared.am_fragment \
-	build_shared/Makefile_sublib_shared.am_fragment COPYING.examples \
+SUBDIRS = $(src_subdirs) libvte/libvtemm $(doc_subdirs) examples
+
+include $(srcdir)/old_news_and_changelogs/filelist.am
+
+text_files = 			\
+	COPYING.examples 	\
 	HACKING
 
+old_news = $(addprefix old_news_and_changelogs/,$(news_files))
+old_changelogs = $(addprefix old_news_and_changelogs/,$(changelog_files))
+
+dist_noinst_DATA = 		\
+	$(text_files) 		\
+	$(old_news) 		\
+	$(old_changelogs)
+
+dist_noinst_SCRIPTS = autogen.sh
+
+libvtemm_includedir = $(includedir)/$(LIBVTEMM_MODULE_NAME)
+libvtemm_include_HEADERS = libvte/libvtemm.h
+libvtemm_libincludedir = $(libdir)/$(LIBVTEMM_MODULE_NAME)/include
+nodist_libvtemm_libinclude_HEADERS = libvte/libvtemmconfig.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = libvte/libvtemm-1.2.pc
 
-all-local:
-	@echo "*** Everything completed ***"
-
-dist-hook:
-	@echo; echo; \
-	echo "**********************************************************"; \
-	echo "* IMPORTANT NOTICE:                                      *"; \
-	echo "*                                                        *"; \
-	echo "* Be sure you have done a complete build before running  *"; \
-	echo "* 'make dist' or 'make distcheck', because otherwise     *"; \
-	echo "* the tarball will _not_ contain the dependency rules    *"; \
-	echo "* generated by the compiler.                             *"; \
-	echo "**********************************************************"; \
-	echo; echo; \
-	if test -d "$(srcdir)/.git"; \
-	then \
-	        echo Creating ChangeLog && \
-	        ( cd "$(top_srcdir)" && \
-	          $(top_srcdir)/scripts/missing --run git log --date=short --pretty=format:"@@@@%cd  %an  <%ae>%n%n%s%n%n%b" | \
-	          @PERL@ -ne 'if ( m/^\s*$$/ ) { if (!$$blank) { print; $$blank=1; } } else {$$blank=0; if (!s/^@@@@// && !/^\t/) { print "\t"; } print; }') > 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
+include $(top_srcdir)/build/dist_changelog.am
diff --git a/autogen.sh b/autogen.sh
index 1981fda..fed2c5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,17 +1,7 @@
-#!/bin/sh
+#! /bin/sh -e
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-dir=`echo "$0" | sed 's,[^/]*$,,'`
-test "x${dir}" = "x" && dir='.'
-if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
-then
-	echo "autogen.sh must be executed from it's directory."
-	exit 1
-fi
-
-echo "Running autoreconf."
-autoreconf -v -i -s || exit $?
-echo "Running configure."
-./configure "$@" || exit $?
-echo
-echo 'run "make"'
-echo
+mm-common-prepare --force --copy "$srcdir"
+autoreconf --force --install "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index d417e4d..4890b39 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -1,9 +1,15 @@
-SUBDIRS = extra_defs_gen m4
+AUTOMAKE_OPTIONS = subdir-objects
 
-include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment
+include $(srcdir)/m4/filelist.am
 
-EXTRA_DIST = $(files_tools_perl) $(files_tools_pm) \
-	Makefile_list_of_sources.am_fragment
+dist_noinst_DATA = $(addprefix m4/,$(files_codegen_m4))
+noinst_PROGRAMS = extradefs/generate_extra_defs
 
+extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_libvte.cc
+extradefs_generate_extra_defs_LDADD   = $(LIBVTEMM_LIBS) -lglibmm_generate_extra_defs-2.4
+
+AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(LIBVTEMM_CFLAGS)
+AM_CXXFLAGS = $(LIBVTEMM_WXXFLAGS)
+
+.DELETE_ON_ERROR:
 
--include $(top_srcdir)/git.mk
diff --git a/codegen/extradefs/generate_defs_vte.cc b/codegen/extradefs/generate_extra_defs_libvte.cc
similarity index 100%
rename from codegen/extradefs/generate_defs_vte.cc
rename to codegen/extradefs/generate_extra_defs_libvte.cc
diff --git a/codegen/m4/filelist.am b/codegen/m4/filelist.am
index b895ad5..15e2292 100644
--- a/codegen/m4/filelist.am
+++ b/codegen/m4/filelist.am
@@ -1 +1 @@
-files_tools_m4 = convert.m4 convert_libvtemm.m4
+files_codegen_m4 = convert.m4 convert_libvtemm.m4
diff --git a/configure.ac b/configure.ac
index 042a15b..0a67371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,159 +1,54 @@
-# configure.ac
-#
-#  This file tests for various compiler features needed to configure 
-#  the gtkmm package.  Original skeleton was provided by Stephan Kulow.
-#  All tests were written by Tero Pulkkinen, Mirko Streckenbach, and 
-#  Karl Nelson.
-#
-#
-#  Copyright 2001 Free Software Foundation
-#  Copyright 1999 gtkmm Development Team
-#  Copyright 1998 Stephan Kulow
-#
+AC_INIT([libvtemm], [0.20.4],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=libvtemm],
+        [libvtemm])
+AC_PREREQ([2.62])
 
-#########################################################################
-#  Version and initialization
-#########################################################################
-m4_define([PACKAGEMM_MAJOR_VERSION], [0])
-m4_define([PACKAGEMM_MINOR_VERSION], [20])
-m4_define([PACKAGEMM_MICRO_VERSION], [4])
-m4_define([PACKAGEMM_RELEASE], [PACKAGEMM_MAJOR_VERSION.PACKAGEMM_MINOR_VERSION])
-m4_define([PACKAGEMM_VERSION], [PACKAGEMM_RELEASE.PACKAGEMM_MICRO_VERSION])
-m4_define([PACKAGEMM_API_MAJOR_VERSION], [1])
-m4_define([PACKAGEMM_API_MINOR_VERSION], [2])
-m4_define([PACKAGEMM_API_VERSION], [PACKAGEMM_API_MAJOR_VERSION.PACKAGEMM_API_MINOR_VERSION])
-m4_define([PACKAGEMM_C_NAME], [vte])
-m4_define([PACKAGEMM_NAME], [lib]PACKAGEMM_C_NAME[mm])
-AC_INIT(PACKAGEMM_NAME, PACKAGEMM_VERSION, [qdlacz gmail com])
-AC_CONFIG_SRCDIR([src/]PACKAGEMM_NAME[.h])
-AC_CONFIG_MACRO_DIR([scripts])
+AC_CONFIG_SRCDIR([libvte/libvtemm.h])
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build])
+AC_CONFIG_HEADERS([config.h libvte/libvtemmconfig.h])
 
-#
-# +1 : ? : +1  == new interface that does not break old one
-# +1 : ? : 0   == new interface that breaks old one
-#  ? : ? : 0   == no new interfaces, but breaks apps
-#  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
-#                 better
-# CURRENT : REVISION : AGE
-LIBVTEMM_SO_VERSION=8:0:0
+MM_PREREQ([0.5])
+MM_INIT_MODULE([libvtemm-1.2])
 
-AC_SUBST([LIBVTEMM_SO_VERSION])
+AC_SUBST([LIBVTEMM_SO_VERSION], [8:0:0])
 
-AC_CONFIG_AUX_DIR(scripts)
+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>])
 
-dnl For automake, pkg-config, Doxygen and config header
-LIBVTEMM_C_PACKAGE_NAME=PACKAGEMM_C_NAME
-LIBVTEMM_PACKAGE_NAME=PACKAGEMM_NAME
-LIBVTEMM_VERSION=PACKAGEMM_VERSION
-LIBVTEMM_DESCRIPTION="C++ wrapper for lib$LIBVTEMM_C_PACKAGE_NAME"
-LIBVTEMM_API_VERSION=PACKAGEMM_API_VERSION
-LIBVTEMM_REQUIRES="glibmm-2.4 gtkmm-2.4 vte"
-LIBVTEMM_MAJOR_VERSION=PACKAGEMM_MAJOR_VERSION
-LIBVTEMM_MINOR_VERSION=PACKAGEMM_MINOR_VERSION
-LIBVTEMM_MICRO_VERSION=PACKAGEMM_MICRO_VERSION
-
-AC_SUBST([LIBVTEMM_C_PACKAGE_NAME])
-AC_SUBST([LIBVTEMM_PACKAGE_NAME])
-AC_SUBST([LIBVTEMM_VERSION])
-AC_SUBST([LIBVTEMM_DESCRIPTION])
-AC_SUBST([LIBVTEMM_API_VERSION])
-AC_SUBST([LIBVTEMM_REQUIRES])
-AC_SUBST([LIBVTEMM_MAJOR_VERSION])
-AC_SUBST([LIBVTEMM_MINOR_VERSION])
-AC_SUBST([LIBVTEMM_MICRO_VERSION])
-
-dnl Initialize automake stuff
-# Initialize automake stuff
-# tar-ustar asks it to use a sensible tar format that can handle long filenames.
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
-
-#########################################################################
-#  Configure arguments 
-#########################################################################
-
-# Add an --enable-reference configure option:
-AL_ENABLE_REFERENCE
-
-# Add an --enable-use-deprecations configure option:
-AL_ENABLE_USE_DEPRECATIONS
-	
-# Add an --enable-deprecated-api configure option:
-AL_ENABLE_DEPRECATED_API
-
-#########################################################################
-#  Environment Checks
-#########################################################################
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-AC_CANONICAL_HOST
-
-AL_CHECK_FOR_WIN32
-
-AM_DISABLE_STATIC
+AC_PROG_CXX
+AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
-AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
-SUN m4 does not work for building libvtemm. 
-Please install GNU m4.]))
-
-AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
-SUN make does not work for building libvtemm.
-Please install GNU make.]))
-
-AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build libvtemm.]))
+AC_PROG_LIBTOOL
 
-AC_CHECK_PROGS(PERL, perl5 perl)
-
-AC_CHECK_PROGS(XSLTPROC, xsltproc)
-
-#########################################################################
-#  Dependency checks
-#########################################################################
+AC_SUBST([LIBVTEMM_MODULES], ['libvte
 PKG_CHECK_MODULES(LIBVTEMM, glibmm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.14.0 vte >= 0.20.5)
-AC_SUBST([LIBVTEMM_CFLAGS])
-AC_SUBST([LIBVTEMM_LIBS])
-
-GMM_PROCDIR=`pkg-config --variable=gmmprocdir glibmm-2.4`
-AC_SUBST([GMM_PROCDIR])
-GMM_PROC=$GMM_PROCDIR/gmmproc
-AC_SUBST([GMM_PROC])
-
-#########################################################################
-#  C++ checks
-#########################################################################
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
-
-AL_DOXYGEN_INPUT_SUBDIRS([$LIBVTEMM_PACKAGE_NAME])
 
-AC_CONFIG_FILES([
-  Makefile
-
-  src/Makefile
-  src/libvtemmconfig.h
-  src/libvtemm-1.2.pc
-    src/libvtemm/Makefile
-      src/libvtemm/g/Makefile
-      src/libvtemm/private/Makefile
-  
-  tools/Makefile
-    tools/extra_defs_gen/Makefile
-    tools/m4/Makefile
-
-  scripts/Makefile
-
-  docs/Makefile
-    docs/reference/Makefile
-    docs/reference/Doxyfile
-
-  examples/Makefile
-    examples/simple/Makefile
-    examples/gettexter/Makefile
-
-  old_news_and_changelogs/Makefile
-])
+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-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([pangomm-1.4.tag], [pangomm-1.4])
+MM_ARG_WITH_TAGFILE_DOC([gtkmm-2.4.tag], [gtkmm-2.4])
+
+AC_LANG([C++])
+MM_ARG_ENABLE_WARNINGS([LIBVTEMM_WXXFLAGS],
+                       [-Wall],
+                       [-pedantic -Wall -Wextra],
+                       [G PANGO ATK GDK GDK_PIXBUF GTK])
+
+AC_CONFIG_FILES([Makefile
+                 codegen/Makefile
+                 libvte/libvtemm-1.2.pc
+                 libvte/libvtemm-1.2-uninstalled.pc
+                 libvte/src/Makefile
+                 libvte/libvtemm/Makefile
+                 examples/Makefile
+                 docs/Makefile
+                 docs/reference/Doxyfile])
 
 AC_OUTPUT
-
diff --git a/docs/Makefile.am b/docs/Makefile.am
index cc87b63..8637fec 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,11 +1,10 @@
-## Copyright (c) 2001
-## The libgdamm development team.
+## Copyright (c) 2009
+## The libvtemm development team.
 
-## This voodoo stuff lets automake see the subdirs
-## without including them into recursive builds.
-if BUILD_REFERENCE 
-SUBDIRS = reference
-endif
-DIST_SUBDIRS = reference
+include $(top_srcdir)/libvte/src/filelist.am
+include $(top_srcdir)/libvte/libvtemm/filelist.am
 
--include $(top_srcdir)/git.mk
+book_name = $(LIBVTEMM_MODULE_NAME)
+doc_input = $(addprefix $(top_srcdir)/libvte/libvtemm/,$(files_built_h))
+
+include $(top_srcdir)/build/doc-reference.am
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 79309a0..f65daae 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -1,4 +1,5 @@
 # Doxyfile 1.5.8
+# @configure_input@
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -25,20 +26,20 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = @LIBVTEMM_PACKAGE_NAME@
+PROJECT_NAME           = @PACKAGE_NAME@
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = @LIBVTEMM_VERSION@
+PROJECT_NUMBER         = @LIBVTEMM_API_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = reference
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -105,7 +106,7 @@ INLINE_INHERITED_MEMB  = NO
 # path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
@@ -114,7 +115,10 @@ FULL_PATH_NAMES        = NO
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = "@abs_top_builddir@/libvte/" \
+                         "@abs_top_srcdir@/libvte/" \
+                         "@abs_top_builddir@/" \
+                         "@abs_top_srcdir@/"
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -123,7 +127,10 @@ STRIP_FROM_PATH        =
 # definition is used. Otherwise one should specify the include paths that 
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    = "@abs_top_builddir@/libvte/" \
+                         "@abs_top_srcdir@/libvte" \
+                         "@abs_top_builddir@/" \
+                         "@abs_top_srcdir@/"
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
@@ -307,13 +314,13 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
-EXTRACT_STATIC         = YES
+EXTRACT_STATIC         = NO
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
 # If set to NO only classes defined in header files are included.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local 
 # methods, which are defined in the implementation section but not in 
@@ -343,21 +350,21 @@ HIDE_UNDOC_MEMBERS     = NO
 # If set to NO (the default) these classes will be included in the various 
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
-HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_CLASSES     = YES
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
 # friend (class|struct|union) declarations. 
 # If set to NO (the default) these declarations will be included in the 
 # documentation.
 
-HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_FRIEND_COMPOUNDS  = YES
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
 # documentation blocks found inside the body of a function. 
 # If set to NO (the default) these blocks will be appended to the 
 # function's detailed documentation block.
 
-HIDE_IN_BODY_DOCS      = NO
+HIDE_IN_BODY_DOCS      = YES
 
 # The INTERNAL_DOCS tag determines if documentation 
 # that is typed after a \internal command is included. If the tag is set 
@@ -403,7 +410,7 @@ SORT_MEMBER_DOCS       = YES
 # by member name. If set to NO (the default) the members will appear in 
 # declaration order.
 
-SORT_BRIEF_DOCS        = YES
+SORT_BRIEF_DOCS        = NO
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
 # hierarchy of group names into alphabetical order. If set to NO (the default) 
@@ -419,25 +426,25 @@ SORT_GROUP_NAMES       = NO
 # Note: This option applies only to the class list, not to the 
 # alphabetical list.
 
-SORT_BY_SCOPE_NAME     = NO
+SORT_BY_SCOPE_NAME     = YES
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
 
-GENERATE_TODOLIST      = YES
+GENERATE_TODOLIST      = NO
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or 
 # disable (NO) the test list. This list is created by putting \test 
 # commands in the documentation.
 
-GENERATE_TESTLIST      = YES
+GENERATE_TESTLIST      = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or 
 # disable (NO) the bug list. This list is created by putting \bug 
 # commands in the documentation.
 
-GENERATE_BUGLIST       = YES
+GENERATE_BUGLIST       = NO
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
 # disable (NO) the deprecated list. This list is created by putting 
@@ -458,7 +465,7 @@ ENABLED_SECTIONS       =
 # documentation can be controlled using \showinitializer or \hideinitializer 
 # command in the documentation regardless of this setting.
 
-MAX_INITIALIZER_LINES  = 30
+MAX_INITIALIZER_LINES  = 2
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
 # at the bottom of the documentation of classes and structs. If set to YES the 
@@ -470,13 +477,13 @@ SHOW_USED_FILES        = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
 # This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
 
-SHOW_FILES             = YES
+SHOW_FILES             = NO
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
 # Namespaces page. 
@@ -553,7 +560,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written 
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           = reference/doxygen.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -564,7 +571,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @PACKAGEMM_DOXYGEN_INPUT@
+INPUT                  = 
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -581,7 +588,7 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = *.h
+FILE_PATTERNS          = 
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -607,7 +614,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */wrap_init.h
+EXCLUDE_PATTERNS       = 
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the 
@@ -615,13 +622,21 @@ EXCLUDE_PATTERNS       = */wrap_init.h
 # wildcard * is used, a substring. Examples: ANamespace, AClass, 
 # AClass::ANamespace, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        = _* \
+                         adaptor_trait \
+                         basic_filebuf \
+                         basic_streambuf \
+                         binary_function \
+                         char_traits \
+                         internal \
+                         pair \
+                         unary_function
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = @top_srcdir@/examples
+EXAMPLE_PATH           = "@abs_top_srcdir@/examples"
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -642,7 +657,7 @@ EXAMPLE_RECURSIVE      = YES
 # directories that contain image that are included in the documentation (see 
 # the \image command).
 
-IMAGE_PATH             = $(DOXYGEN_IMAGE_PATH)
+IMAGE_PATH             = 
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should 
 # invoke to filter for each input file. Doxygen will invoke the filter program 
@@ -692,19 +707,19 @@ INLINE_SOURCES         = NO
 # doxygen to hide any special comment blocks from generated source code 
 # fragments. Normal C and C++ comments will always remain visible.
 
-STRIP_CODE_COMMENTS    = NO
+STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = YES
+REFERENCED_BY_RELATION = NO
 
 # If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
-REFERENCES_RELATION    = YES
+REFERENCES_RELATION    = NO
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
@@ -776,13 +791,13 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = libvtemm_header.html_fragment
+HTML_HEADER            = "@abs_top_srcdir@/docs/reference/libvtemm_header.html_fragment"
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = libvtemm_footer.html_fragment
+HTML_FOOTER            = "@abs_top_srcdir@/docs/reference/libvtemm_footer.html_fragment"
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
@@ -930,7 +945,7 @@ QHG_LOCATION           =
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.
@@ -952,7 +967,7 @@ ENUM_VALUES_PER_LINE   = 1
 # releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
 # respectively.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = NONE
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
@@ -1023,13 +1038,13 @@ LATEX_HEADER           =
 # contain links (just like the HTML output) instead of page references 
 # This makes the output suitable for online browsing using a pdf viewer.
 
-PDF_HYPERLINKS         = NO
+PDF_HYPERLINKS         = YES
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
 # plain latex in the generated Makefile. Set this option to YES to get a 
 # higher quality PDF documentation.
 
-USE_PDFLATEX           = NO
+USE_PDFLATEX           = YES
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
 # command to the generated LaTeX files. This will instruct LaTeX to keep 
@@ -1122,7 +1137,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1147,7 +1162,7 @@ XML_DTD                =
 # and cross-referencing information) to the XML output. Note that 
 # enabling this will significantly increase the size of the XML output.
 
-XML_PROGRAMLISTING     = YES
+XML_PROGRAMLISTING     = NO
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -1222,20 +1237,21 @@ EXPAND_ONLY_PREDEF     = YES
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
 
-SEARCH_INCLUDES        = NO
+SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that 
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           = "@abs_top_builddir@/libvte" \
+                         "@abs_top_srcdir@/libvte"
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
 # patterns (like *.h and *.hpp) to filter out the header-files in the 
 # directories. If left blank, the patterns specified with FILE_PATTERNS will 
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  = *.h
 
 # The PREDEFINED tag can be used to specify one or more macro names that 
 # are defined before the preprocessor is started (similar to the -D option of 
@@ -1245,21 +1261,28 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
-                         GTKMM_USING_STD(x)= \
-                         GTKMM_API \
+PREDEFINED             = __cplusplus \
+                         DOXYGEN_SHOULD_SKIP_THIS \
+                         "G_GNUC_CONST=" \
+                         "G_GNUC_NORETURN=" \
+                         "G_GNUC_NULL_TERMINATED=" \
+                         "G_GNUC_PURE=" \
                          GTKMM_ATKMM_ENABLED \
                          GLIBMM_VFUNCS_ENABLED \
                          GLIBMM_PROPERTIES_ENABLED \
                          GLIBMM_EXCEPTIONS_ENABLED \
-                         GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+                         GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED \
+                         "GTKMM_API=" \
+                         "GTKMM_USING_STD(x)="
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
 # The macro definition that is found in the sources will be used. 
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      = LIBVTEMM_MAJOR_VERSION \
+                         LIBVTEMM_MINOR_VERSION \
+                         LIBVTEMM_MICRO_VERSION
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
@@ -1290,14 +1313,12 @@ SKIP_FUNCTION_MACROS   = YES
 # If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = ../../../glibmm/docs/reference/glibmm_doxygen_tags \
-                         ../../../pangomm/docs/reference/pangomm_doxygen_tags \
-                         ../../../gtkmm/docs/reference/gtkmm_doxygen_tags
+TAGFILES               = @DOXYGEN_TAGFILES@
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = libvtemm_doxygen_tags
+GENERATE_TAGFILE       = "reference/@LIBVTEMM_MODULE_NAME.tag"
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes 
@@ -1309,12 +1330,12 @@ ALLEXTERNALS           = NO
 # in the modules index. If set to NO, only the current project's groups will 
 # be listed.
 
-EXTERNAL_GROUPS        = YES
+EXTERNAL_GROUPS        = NO
 
 # The PERL_PATH should be the absolute path and name of the perl script 
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH              = @PERL_PATH@
+PERL_PATH              = @PERL@
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   
@@ -1327,7 +1348,7 @@ PERL_PATH              = @PERL_PATH@
 # fallback. It is recommended to install and use dot, since it yields more 
 # powerful graphs.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc 
 # command. Doxygen will then run the mscgen tool (see 
@@ -1402,7 +1423,7 @@ UML_LOOK               = NO
 # If set to YES, the inheritance and collaboration graphs will show the 
 # relations between templates and their instances.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
 # tags are set to YES then doxygen will generate a graph for each documented 
@@ -1444,7 +1465,7 @@ GRAPHICAL_HIERARCHY    = YES
 # in a graphical way. The dependency relations are determined by the #include 
 # relations between the files in the directories.
 
-DIRECTORY_GRAPH        = YES
+DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif 
@@ -1496,7 +1517,7 @@ DOT_TRANSPARENT        = NO
 # makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
-DOT_MULTI_TARGETS      = NO
+DOT_MULTI_TARGETS      = YES
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
diff --git a/docs/reference/libvtemm_footer.html_fragment b/docs/reference/libvtemm_footer.html_fragment
index 0575b3c..b46a4bf 100644
--- a/docs/reference/libvtemm_footer.html_fragment
+++ b/docs/reference/libvtemm_footer.html_fragment
@@ -1,5 +1,8 @@
+</div>
+<!-- end main content -->
+
 <hr><address><small>
 Generated for $projectname by <a href="http://www.doxygen.org/index.html";>
-Doxygen</a> $doxygenversion &copy;&nbsp;1997-2008</small></address>
+Doxygen</a> $doxygenversion &copy;&nbsp;1997-2009</small></address>
 </body>
 </html>
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ad8e05d..0a51f99 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,30 @@
 ## Copyright (c) 2008
 ## The libvtemm development team. (based on libgdamm development team's work)
 
-SUBDIRS = simple gettexter
+AUTOMAKE_OPTIONS = subdir-objects
 
-EXTRA_DIST = Makefile.am_fragment README
+check_PROGRAMS = 		\
+	simple/example		\
+	gettexter/example
 
+libvtemm_includes = -I$(top_builddir)/libvte $(if $(srcdir:.=),-I$(top_srcdir)/libvte)
+local_cppflags    = -I$(top_builddir) $(libvtemm_includes)
 
+AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(LIBVTEMM_CFLAGS)
+AM_CXXFLAGS = $(LIBVTEMM_WXXFLAGS)
 
--include $(top_srcdir)/git.mk
+local_libvtemm = $(top_builddir)/libvte/libvtemm/libvtemm-$(LIBVTEMM_API_VERSION).la
+
+LDADD = $(LIBVTEMM_LIBS) $(local_libvtemm)
+
+simple_example_SOURCES = 	\
+	simple/simple.cc 	\
+	simple/simple.h 	\
+	simple/main.cc
+
+gettexter_example_SOURCES = 	\
+	gettexter/gtterminal.cc	\
+	gettexter/gtterminal.h	\
+	gettexter/gettexter.cc	\
+	gettexter/gettexter.h	\
+	main.cc
diff --git a/libvte/libvtemm-1.2-uninstalled.pc.in b/libvte/libvtemm-1.2-uninstalled.pc.in
new file mode 100644
index 0000000..a786d20
--- /dev/null
+++ b/libvte/libvtemm-1.2-uninstalled.pc.in
@@ -0,0 +1,9 @@
+doxytagfile=${docdir}/reference/@LIBVTEMM_MODULE_NAME  tag
+htmlrefpub=
+
+Name: libvtemm
+Description: C++ binding for libvte
+Version: @PACKAGE_VERSION@
+Requires: @LIBVTEMM_MODULES@
+Libs: ${pc_top_builddir}/${pcfiledir}/libvtemm/libvtemm- LIBVTEMM_API_VERSION@.la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/libvte/libvtemm-1.2.pc.in b/libvte/libvtemm-1.2.pc.in
index 14acc5d..f26803b 100644
--- a/libvte/libvtemm-1.2.pc.in
+++ b/libvte/libvtemm-1.2.pc.in
@@ -1,11 +1,18 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
 includedir= includedir@
 
-Name: @LIBVTEMM_PACKAGE_NAME@
-Description: @LIBVTEMM_DESCRIPTION@
-Requires: @LIBVTEMM_REQUIRES@
-Version: @LIBVTEMM_VERSION@
-Libs: -L${libdir} -l LIBVTEMM_C_PACKAGE_NAME@mm- LIBVTEMM_API_VERSION@
-Cflags: -I${includedir}/@LIBVTEMM_PACKAGE_NAME -@LIBVTEMM_API_VERSION@ -I${libdir}/@LIBVTEMM_PACKAGE_NAME -@LIBVTEMM_API_VERSION@/include
+docdir=${datarootdir}/doc/@LIBVTEMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@LIBVTEMM_MODULE_NAME  tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=
+
+Name: libvtemm
+Description: C++ binding for libvte
+Version: @PACKAGE_VERSION@
+Requires: @LIBVTEMM_MODULES@
+Libs: -L${libdir} -lvtemm- LIBVTEMM_API_VERSION@
+Cflags: -I${includedir}/@LIBVTEMM_MODULE_NAME@ -I${libdir}/@LIBVTEMM_MODULE_NAME@/include
diff --git a/libvte/libvtemm/Makefile.am b/libvte/libvtemm/Makefile.am
index 47824ef..08efc6e 100644
--- a/libvte/libvtemm/Makefile.am
+++ b/libvte/libvtemm/Makefile.am
@@ -1,23 +1,19 @@
 ## Copyright (c) 2009
 ## The libvtemm development team.
 
-SUBDIRS = g private
+lib_LTLIBRARIES = libvtemm-1.2.la
 
-files_extra_h = cursorposition.h init.h match.h padding.h ptymaster.h ptysize.h \
-	textandcharattrs.h wrap_init.h shared.h
-files_extra_cc = cursorposition.cc init.cc match.cc padding.cc ptymaster.cc ptysize.cc \
-	textandcharattrs.cc
+include $(srcdir)/../src/filelist.am
+include $(srcdir/filelist.am
+include $(top_srcdir)/build/compile_binding.am
 
-files_internal_h = internalroutines.h
-files_internal_cc = internalroutines.cc
+AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(LIBVTEMM_CFLAGS)
+AM_CXXFLAGS = $(LIBVTEMM_WXXFLAGS)
 
-include $(top_srcdir)/build_shared/Makefile_shared.am_fragment
-#defined:
-# generated_sources_cc
+libvtemm_1_2_la_SOURCES = $(binding_sources) $(files_internal_cc)
+libvtemm_1_2_la_LDFLAGS = -no-undefined -version-info $(LIBVTEMM_SO_VERSION)
+libvtemm_1_2_la_LIBADD  = $(LIBVTEMM_LIBS)
 
-lib_LTLIBRARIES = libvtemm-1.1.la
-libvtemm_1_1_la_SOURCES = $(files_extra_cc) $(generated_sources_cc) $(files_internal_cc)
-libvtemm_1_1_la_LDFLAGS = $(common_ldflags)
-libvtemm_1_1_la_LIBADD = @LIBVTEMM_LIBS@
-
--include $(top_srcdir)/git.mk
+EXTRA_DIST = 			\
+	$(files_internal_h) 	\
+	$(files_internal_cc)
diff --git a/libvte/libvtemm/filelist.am b/libvte/libvtemm/filelist.am
new file mode 100644
index 0000000..4c36692
--- /dev/null
+++ b/libvte/libvtemm/filelist.am
@@ -0,0 +1,30 @@
+## Copyright (c) 2009
+## The libvtemm development team.
+
+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_internal_h  = internalroutines.h
+files_internal_cc = internalroutines.cc
+
+files_extra_cc    = 		\
+	cursorposition.cc 	\
+	init.cc 		\
+	match.cc 		\
+	padding.cc 		\
+	ptymaster.cc 		\
+	ptysize.cc 		\
+	textandcharattrs.cc
+
+files_extra_h     = 		\
+	cursorposition.h 	\
+	init.h 			\
+	match.h 		\
+	padding.h 		\
+	ptymaster.h 		\
+	ptysize.h 		\
+	textandcharattrs.h 	\
+	wrap_init.h 		\
+	shared.h
+
+files_extra_ph    =
diff --git a/libvte/libvtemmconfig.h.in b/libvte/libvtemmconfig.h.in
index b0124bb..a99adba 100644
--- a/libvte/libvtemmconfig.h.in
+++ b/libvte/libvtemmconfig.h.in
@@ -1,16 +1,18 @@
-/* autoheader is tiresome */
-
 #ifndef _LIBVTEMM_CONFIG_H_
 #define _LIBVTEMM_CONFIG_H_
 
 #include <gtkmmconfig.h>
 
-#define LIBVTEMM_MAJOR_VERSION @LIBVTEMM_MAJOR_VERSION@
+/* Define to omit deprecated API from libvtemm. */
+#undef LIBVTEMM_DISABLE_DEPRECATED
 
-#define LIBVTEMM_MINOR_VERSION @LIBVTEMM_MINOR_VERSION@
+/* Major version number of libvtemm. */
+#undef LIBVTEMM_MAJOR_VERSION
 
-#define LIBVTEMM_MICRO_VERSION @LIBVTEMM_MICRO_VERSION@
+/* Minor versino number of libvtemm. */
+#undef LIBVTEMM_MINOR_VERSION
 
- LIBVTEMM_DISABLE_DEPRECATED_DEF@
+/* Micro version number of libvtemm. */
+#undef LIBVTEMM_MICRO_VERSION
 
 #endif // _LIBVTEMM_CONFIG_H_
diff --git a/libvte/src/Makefile.am b/libvte/src/Makefile.am
index e308710..03a5e62 100644
--- a/libvte/src/Makefile.am
+++ b/libvte/src/Makefile.am
@@ -1,19 +1,10 @@
 ## Copyright (c) 2009
 ## The libvtemm development team.
 
-include $(srcdir)/Makefile_defs.am_fragment
-# defined:
-#  files_defs
+binding_name = libvtemm
+wrap_init_flags = --namespace=Gnome --namespace=Vte --parent_dir=libvtemm
 
-include $(srcdir)/Makefile_list_of_hg.am_fragment
-# defined:
-#  files_hg
-#  deprecated_hg
+include $(srcdir)/filelist.am
+include $(top_srcdir)/codegen/m4/filelist.am
+include $(top_srcdir)/build/generate-binding.am
 
-files_ccg = $(files_hg:.hg=.ccg)
-deprecated_ccg = $(files_ccg:.h=.ccg)
-
-EXTRA_DIST = $(files_defs) $(files_hg) $(files_ccg) Makefile_defs.am_fragment \
-	Makefile_list_of_hg.am_fragment $(deprecated_hg) $(deprecated_ccg)
-
--include $(top_srcdir)/git.mk
diff --git a/libvte/src/filelist.am b/libvte/src/filelist.am
new file mode 100644
index 0000000..745a06b
--- /dev/null
+++ b/libvte/src/filelist.am
@@ -0,0 +1,13 @@
+## Copyright (c) 2009
+## The libvtemm development team.
+
+files_defs = 			\
+	libvte.defs 		\
+	libvte_methods.defs 	\
+	libvte_signals.defs 	\
+	libvte_enums.defs 	\
+	libvte_docs.xml 	\
+	libvte_docs_override.xml
+
+files_hg  = terminal.hg charattributes.hg terminalaccessible.hg
+files_ccg = $(files_hg:.hg=.ccg)
diff --git a/old_news_and_changelogs/filelist.am b/old_news_and_changelogs/filelist.am
new file mode 100644
index 0000000..19506d6
--- /dev/null
+++ b/old_news_and_changelogs/filelist.am
@@ -0,0 +1,10 @@
+news_files = 		\
+	NEWS-0.16 	\
+	NEWS-0.17 	\
+	NEWS-0.18
+
+changelogs_files = 		\
+	ChangeLog-0.16 		\
+	ChangeLog-0.17 		\
+	ChangeLog-0.19 		\
+	ChangeLog.pre-git
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]