[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-cppi] FYI: update to latest gnulib and adapt
From: |
Jim Meyering |
Subject: |
[bug-cppi] FYI: update to latest gnulib and adapt |
Date: |
Sat, 03 Apr 2010 18:18:36 +0200 |
FYI,
>From 71d0e0e6462693d1317a84a3fb451d93c7aa0184 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 3 Apr 2010 17:44:35 +0200
Subject: [PATCH] gnulib: update to latest; and use lib-ignore
* bootstrap.conf (gnulib_modules): Add lib-ignore.
* src/Makefile.am (AM_LDFLAGS): Define. Use gnulib's new
$(IGNORE_UNUSED_LIBRARIES_CFLAGS).
* cfg.mk (sc_prohibit_tab_based_indentation): Adapt to use
_sc_search_regexp rather than _prohibit_regexp.
(sc_prohibit_emacs__indent_tabs_mode__setting): Likewise.
---
bootstrap.conf | 1 +
cfg.mk | 12 ++++++------
gnulib | 2 +-
src/Makefile.am | 3 +++
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index dc3c062..6aacf47 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -38,6 +38,7 @@ gnulib_modules="
gnumakefile
gnupload
intprops
+ lib-ignore
malloc
maintainer-makefile
manywarnings
diff --git a/cfg.mk b/cfg.mk
index f32a31d..5c04e4a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -32,15 +32,15 @@ old_NEWS_hash = 33baa6cc170e88d0627ef86668414353
# Indent only with spaces.
sc_prohibit_tab_based_indentation:
- @re='^ * ' \
- msg='TAB in indentation; use only spaces' \
- $(_prohibit_regexp)
+ @prohibit='^ * ' \
+ halt='TAB in indentation; use only spaces' \
+ $(_sc_search_regexp)
# Don't use "indent-tabs-mode: nil" anymore. No longer needed.
sc_prohibit_emacs__indent_tabs_mode__setting:
- @re='^( *[*#] *)?indent-tabs-mode:' \
- msg='use of emacs indent-tabs-mode: setting' \
- $(_prohibit_regexp)
+ @prohibit='^( *[*#] *)?indent-tabs-mode:' \
+ halt='use of emacs indent-tabs-mode: setting' \
+ $(_sc_search_regexp)
bootstrap-tools = autoconf,automake,flex,gnulib,gperf,help2man
diff --git a/gnulib b/gnulib
index e01b458..219c504 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e01b458f40440e64ce6f59beb0b446219bb6302d
+Subproject commit 219c504b3178a07389eef1cd411bde3864f3f54c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1bbee54..20dc017 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,9 @@ cppi_SOURCES = \
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+# Tell the linker to omit references to unused shared libraries.
+AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
+
EXTRA_DIST = cpp.gp cpp-indent.pl cppi.l cpp-cond.c
MAINTAINERCLEANFILES = cpp-cond.c
CLEANFILES = cpp.h lex.backup
--
1.7.0.4.529.g78fb
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-cppi] FYI: update to latest gnulib and adapt,
Jim Meyering <=