From: Mike Frysinger <vapier@gentoo.org>
To: kbd@lists.altlinux.org
Subject: [kbd] [PATCH 1/3] fix various vlock build errors
Date: Sun, 2 Dec 2012 16:16:44 -0500
Message-ID: <1354483006-17453-1-git-send-email-vapier@gentoo.org> (raw)
The current code assumes the build is done in-tree and sets up -I paths
according to that. As such, out-of-tree builds fail. Fix AM_CPPFLAGS
to work in either case.
No build system should hardcode optimization/pipe flags. So delete that
AM_CFLAGS line and let the configure/user build settings work.
Finally, EXTRA_DIST should not be conditional. Otherwise, the configure
flags will impact the tarball created by `make distcheck`.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
src/vlock/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/vlock/Makefile.am b/src/vlock/Makefile.am
index 3f074f4..fa9f5be 100644
--- a/src/vlock/Makefile.am
+++ b/src/vlock/Makefile.am
@@ -1,9 +1,9 @@
-AM_CPPFLAGS = -I.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\"
-AM_CFLAGS = -pipe -O2
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\"
+
+EXTRA_DIST = README.vlock
if VLOCK
bin_PROGRAMS = vlock
-EXTRA_DIST = README.vlock
endif
vlock_SOURCES = \
--
1.7.12.4
next reply other threads:[~2012-12-02 21:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-02 21:16 Mike Frysinger [this message]
2012-12-02 21:16 ` [kbd] [PATCH 2/3] fix loadkeys.analyze lex handling Mike Frysinger
2012-12-02 21:16 ` [kbd] [PATCH 3/3] ignore config.cache files Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354483006-17453-1-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=kbd@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Linux console tools development discussion
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/kbd/0 kbd/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 kbd kbd/ http://lore.altlinux.org/kbd \
kbd@lists.altlinux.org kbd@lists.altlinux.ru kbd@lists.altlinux.com
public-inbox-index kbd
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.kbd
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git