[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7934415: * Makefile.in (SUBDIR_MAKEFILES):
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 7934415: * Makefile.in (SUBDIR_MAKEFILES): |
Date: |
Tue, 09 Jun 2015 19:23:54 +0000 |
branch: master
commit 79344156956891ded1ab79c42e8b4bc467366b3b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* Makefile.in (SUBDIR_MAKEFILES):
* lwlib/Makefile.in (WARN_CFLAGS):
Use built-in Make functions rather than echo+sed.
---
Makefile.in | 2 +-
lwlib/Makefile.in | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d2948f8..63e17c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,7 @@ SUBDIR = $(NTDIR) lib lib-src src lisp
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
-SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
+SUBDIR_MAKEFILES = $(patsubst ${srcdir}/%,%,${SUBDIR_MAKEFILES_IN:.in=})
# Subdirectories to install, and where they'll go. lib-src's and nt's
# makefiles know how to install them, so we don't do that here.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index cbc747c..bfeef16 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -31,7 +31,8 @@ address@hidden@
address@hidden@
address@hidden@
PROFILING_CFLAGS = @PROFILING_CFLAGS@
-WARN_CFLAGS = `echo @WARN_CFLAGS@ | sed 's/ -Wwrite-strings//'`
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS := $(filter-out -Wwrite-strings,${WARN_CFLAGS})
WERROR_CFLAGS = @WERROR_CFLAGS@
CAIRO_CFLAGS= @CAIRO_CFLAGS@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7934415: * Makefile.in (SUBDIR_MAKEFILES):,
Glenn Morris <=