From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ernst.netinsight.se ([194.16.221.21]) by merlin.infradead.org with smtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLqJS-0000E4-Kq for kexec@lists.infradead.org; Fri, 07 Mar 2014 08:39:27 +0000 Date: Fri, 7 Mar 2014 09:38:50 +0100 From: Simon =?UTF-8?B?S8OlZ3N0csO2bQ==?= Subject: [PATCH v2 4/4] build: Rename generic-sounding SRC -> SRC_BASE Message-ID: <20140307093850.143b034e@marrow.netinsight.se> In-Reply-To: <20140307093626.09701790@marrow.netinsight.se> References: <20140307093626.09701790@marrow.netinsight.se> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: "kexec@lists.infradead.org" , Atsushi Kumagai This aligns naming with SRC_PART and SRC_ARCH. In our case, we also use SRC as an environment variable in an outer Makefile (which calls the makedumpfile one), which messes things up here. Signed-off-by: Simon Kagstrom --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b9121ad..ccf54e1 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ CFLAGS += -m32 CFLAGS_ARCH += -m32 endif -SRC = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h +SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c @@ -69,7 +69,7 @@ $(OBJ_ARCH): $(SRC_ARCH) @mkdir -p $(@D) $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c) -makedumpfile: $(SRC) $(OBJ_PART) $(OBJ_ARCH) +makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 -- 1.7.9.6 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec