Patchwork automake: don't use @foo@ constructs in Makefile.am

login
register
mail settings
Submitter Jeff Layton
Date April 13, 2010, 2:26 p.m.
Message ID <1271168771-9253-1-git-send-email-jlayton@samba.org>
Download mbox | patch
Permalink /patch/50067/
State New
Headers show

Comments

Jeff Layton - April 13, 2010, 2:26 p.m.
...use $(foo) instead. That doesn't rely on an explicit AC_SUBST().

Reported-by: Lars Müller <lars@samba.org>
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Lars Müller - April 13, 2010, 3:04 p.m.
On Tue, Apr 13, 2010 at 10:26:11AM -0400, Jeff Layton wrote:
> ...use $(foo) instead. That doesn't rely on an explicit AC_SUBST().

Works well.  Thanks.

Lars
Jeff Layton - April 14, 2010, 12:41 p.m.
On Tue, 13 Apr 2010 10:26:11 -0400
Jeff Layton <jlayton@samba.org> wrote:

> ...use $(foo) instead. That doesn't rely on an explicit AC_SUBST().
> 
> Reported-by: Lars Müller <lars@samba.org>
> Signed-off-by: Jeff Layton <jlayton@samba.org>
> ---
>  Makefile.am |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 

Committed to git tree.

Patch

diff --git a/Makefile.am b/Makefile.am
index 01f1762..1cf7d23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,14 @@  ACLOCAL_AMFLAGS = -I aclocal
 root_sbindir = "/sbin"
 root_sbin_PROGRAMS = mount.cifs
 mount_cifs_SOURCES = mount.cifs.c mtab.c util.c
-mount_cifs_LDADD = @LIBCAP@ @CAPNG_LDADD@
+mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD)
 
 man_MANS = mount.cifs.8
 
 if CONFIG_CIFSUPCALL
 sbin_PROGRAMS = cifs.upcall
 cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c util.c
-cifs_upcall_LDADD = -ltalloc -lkeyutils @KRB5_LDADD@
+cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD)
 man_MANS += cifs.upcall.8
 endif