[libvtemm] Fixes in build system.
- From: Krzesimir Nowak <krnowak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libvtemm] Fixes in build system.
- Date: Wed, 19 Aug 2009 22:02:10 +0000 (UTC)
commit a82139cd28519363a4111b81494e09aacd0d5b10
Author: Krzesimir Nowak <qdlacz gmail com>
Date: Wed Aug 19 22:03:07 2009 +0200
Fixes in build system.
* Makefile.am: Correct typos in documentation directory name
and mm-common file.
* autogen.sh: Set autoreconf to warn about everything.
* codegen/m4/filelist.am: Correct a name of .m4 file.
* configure.ac: Move config.h to build directory. Use silent rules
if supported. Don't use deprecated libtool macros.
* examples/Makefile.am: Correct a path to gettexter's main.cc.
* libvte/libvtemm/Makefile.am: Correct typos in includes. Leave
internal headers only in EXTRA_DIST - internal sources are already
checked to be distributed.
* libvte/libvtemm/filelist.am: Correct a typo in files_built_ph.
* old_news_and_changelogs/filelist.am: Correct typos in NEWS
version and in changelog variable name.
Makefile.am | 5 +++--
autogen.sh | 2 +-
codegen/m4/filelist.am | 2 +-
configure.ac | 12 ++++++++----
examples/Makefile.am | 2 +-
libvte/libvtemm/Makefile.am | 7 +++----
libvte/libvtemm/filelist.am | 2 +-
old_news_and_changelogs/filelist.am | 4 ++--
8 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6a7f369..eab451a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,9 @@ src_subdirs = codegen libvte/src
else
src_subdirs =
endif
+
if ENABLE_DOCUMENTATION
-doc_subdirs = doc
+doc_subdirs = docs
else
doc_subdirs =
endif
@@ -41,4 +42,4 @@ nodist_libvtemm_libinclude_HEADERS = libvte/libvtemmconfig.h
pkgconfigdir = $(libdir)/pkgconfig
nodist_pkgconfig_DATA = libvte/libvtemm-1.2.pc
-include $(top_srcdir)/build/dist_changelog.am
+include $(top_srcdir)/build/dist-changelog.am
diff --git a/autogen.sh b/autogen.sh
index a373a28..b040e8e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,5 +3,5 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=.
mm-common-prepare --force --copy "$srcdir"
-autoreconf --verbose --force --install "$srcdir"
+autoreconf --verbose --force --install --warnings=all "$srcdir"
test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/codegen/m4/filelist.am b/codegen/m4/filelist.am
index 15e2292..d91131b 100644
--- a/codegen/m4/filelist.am
+++ b/codegen/m4/filelist.am
@@ -1 +1 @@
-files_codegen_m4 = convert.m4 convert_libvtemm.m4
+files_codegen_m4 = convert.m4 convert_libvte.m4
diff --git a/configure.ac b/configure.ac
index 8103ac9..0a03999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.62])
AC_CONFIG_SRCDIR([libvte/libvtemm.h])
AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build])
-AC_CONFIG_HEADERS([config.h libvte/libvtemmconfig.h])
+AC_CONFIG_HEADERS([build/config.h libvte/libvtemmconfig.h])
MM_PREREQ([0.5])
MM_INIT_MODULE([libvtemm-1.2])
@@ -14,13 +14,17 @@ MM_INIT_MODULE([libvtemm-1.2])
AC_SUBST([LIBVTEMM_SO_VERSION], [8:0:0])
AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+# AC_DISABLE_STATIC
+# AC_LIBTOOL_WIN32_DLL
+# AC_PROG_LIBTOOL
+LT_INIT([win32-dll disable-static])
AC_PROG_CXX
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
AC_SUBST([LIBVTEMM_MODULES], ['glibmm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.14.0 vte >= 0.20.5'])
PKG_CHECK_MODULES([LIBVTEMM], [$LIBVTEMM_MODULES])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0a51f99..2f8ef4a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -27,4 +27,4 @@ gettexter_example_SOURCES = \
gettexter/gtterminal.h \
gettexter/gettexter.cc \
gettexter/gettexter.h \
- main.cc
+ gettexter/main.cc
diff --git a/libvte/libvtemm/Makefile.am b/libvte/libvtemm/Makefile.am
index 08efc6e..d05f312 100644
--- a/libvte/libvtemm/Makefile.am
+++ b/libvte/libvtemm/Makefile.am
@@ -4,8 +4,8 @@
lib_LTLIBRARIES = libvtemm-1.2.la
include $(srcdir)/../src/filelist.am
-include $(srcdir/filelist.am
-include $(top_srcdir)/build/compile_binding.am
+include $(srcdir)/filelist.am
+include $(top_srcdir)/build/compile-binding.am
AM_CPPFLAGS = $(binding_includes) $(binding_cppflags) $(GTHREAD_CFLAGS) $(LIBVTEMM_CFLAGS)
AM_CXXFLAGS = $(LIBVTEMM_WXXFLAGS)
@@ -15,5 +15,4 @@ libvtemm_1_2_la_LDFLAGS = -no-undefined -version-info $(LIBVTEMM_SO_VERSION)
libvtemm_1_2_la_LIBADD = $(LIBVTEMM_LIBS)
EXTRA_DIST = \
- $(files_internal_h) \
- $(files_internal_cc)
+ $(files_internal_h)
diff --git a/libvte/libvtemm/filelist.am b/libvte/libvtemm/filelist.am
index 4c36692..2577ea8 100644
--- a/libvte/libvtemm/filelist.am
+++ b/libvte/libvtemm/filelist.am
@@ -3,7 +3,7 @@
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_built_ph = $(patsubst %.hg,private/%_p.h,$(files_hg))
files_internal_h = internalroutines.h
files_internal_cc = internalroutines.cc
diff --git a/old_news_and_changelogs/filelist.am b/old_news_and_changelogs/filelist.am
index 19506d6..dfc6def 100644
--- a/old_news_and_changelogs/filelist.am
+++ b/old_news_and_changelogs/filelist.am
@@ -1,9 +1,9 @@
news_files = \
NEWS-0.16 \
NEWS-0.17 \
- NEWS-0.18
+ NEWS-0.19
-changelogs_files = \
+changelog_files = \
ChangeLog-0.16 \
ChangeLog-0.17 \
ChangeLog-0.19 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]