[PATCH] generate object files like foo.o (not iwhd-foo.o) for iwhd

Jim Meyering jim at meyering.net
Tue Mar 15 14:17:49 UTC 2011


FYI, a little tricky, but inconsequential...

>From a62f875dd59628d34223e5bac1add0aac7b17afb Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 15 Mar 2011 15:09:16 +0100
Subject: [PATCH] generate object files like foo.o (not iwhd-foo.o) for iwhd

Tell automake to stop prepending "iwhd-" to each of iwhd's
object file names.
* Makefile.am (AM_YFLAGS): Rename from iwhd_YFLAGS.
(AM_CPPFLAGS): Rename from iwhd_CPPFLAGS.
* t/Makefile.am (parser.c): Include "qparser.c", not "iwhd-qparser.c".

Tell automake to stop prepending "iwhd-" to each of iwhd's
object file names.
(AM_CPPFLAGS): Rename from iwhd_CPPFLAGS.
---
 Makefile.am   |    4 ++--
 t/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8726a2e..90b279a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@

 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)

-iwhd_YFLAGS = -d
+AM_YFLAGS = -d

 SUBDIRS = lib . gnulib-tests t man
 ACLOCAL_AMFLAGS = -I m4
@@ -131,7 +131,7 @@ uninstall-local:
 	  $(DESTDIR)$(sysconfdir)/iwhd/conf.js
 	rmdir $(DESTDIR)$(DEFAULT_FS_DIR)

-iwhd_CPPFLAGS = $(HAIL_CFLAGS) -I$(top_srcdir)/lib
+AM_CPPFLAGS = $(HAIL_CFLAGS) -I$(top_srcdir)/lib
 iwhd_LDADD =		\
   lib/libiwhd.a		\
   -lgc -lpthread	\
diff --git a/t/Makefile.am b/t/Makefile.am
index 263ec73..635f1ef 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -37,7 +37,7 @@ parser_LDADD = -L../lib -liwhd -lgc -lpthread
 parser.c: Makefile.am
 	rm -f $@-t $@
 	printf '#define PARSER_UNIT_TEST 1\n' > $@-t
-	printf '#include "iwhd-qparser.c"\n' >> $@-t
+	printf '#include "qparser.c"\n' >> $@-t
 	chmod a=r $@-t
 	mv $@-t $@

--
1.7.4.1.408.gb6b16


More information about the iwhd-devel mailing list