From patchwork Wed Nov 9 14:54:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan DeKok X-Patchwork-Id: 124565 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 47584B6F80 for ; Thu, 10 Nov 2011 01:54:50 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 0D5079C1DE; Wed, 9 Nov 2011 09:54:48 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jKfn0hW1AT55; Wed, 9 Nov 2011 09:54:47 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id E2F6C9D0D5; Wed, 9 Nov 2011 09:54:43 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 72EA49D0D5 for ; Wed, 9 Nov 2011 09:54:43 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xLT4nzvR4584 for ; Wed, 9 Nov 2011 09:54:38 -0500 (EST) Received: from liberty.deployingradius.com (liberty.deployingradius.com [88.191.76.128]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 641859C1DE for ; Wed, 9 Nov 2011 09:54:38 -0500 (EST) Message-ID: <4EBA942C.40803@deployingradius.com> Date: Wed, 09 Nov 2011 15:54:36 +0100 From: Alan DeKok User-Agent: Thunderbird 2.0.0.24 (Macintosh/20100228) MIME-Version: 1.0 To: hostap@lists.shmoo.com Subject: Minor fix to wpa_supplicant/Makefile X-Enigmail-Version: 0.96.0 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com I ran into some build issues when editing .config. Changing it resulted in re-linking of objects, but not rebuilding of objects. The attached patch fixes that. Alan DeKok. From 95d7542bae8ca40bc9f50a3f72f702b2900b117d Mon Sep 17 00:00:00 2001 From: Alan T. DeKok Date: Wed, 9 Nov 2011 15:50:40 +0100 Subject: [PATCH] Make objects depend on the .config file The source code compiles into different objects depending on the contents of .config. Therefore, the objects should depend on .config. Previously, only the executables depended on .config. This meant that they were re-linked when .config changed. But that relink process used the old (and now wrong) objects. --- wpa_supplicant/Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 3641a58..d91880b 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1397,15 +1397,17 @@ wpa_priv: $(BCHECK) $(OBJS_priv) $(Q)$(LDO) $(LDFLAGS) -o wpa_priv $(OBJS_priv) $(LIBS) @$(E) " LD " $@ -wpa_supplicant: .config $(BCHECK) $(OBJS) $(EXTRA_progs) +$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config + +wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) @$(E) " LD " $@ -eapol_test: .config $(OBJS_t) +eapol_test: $(OBJS_t) $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS) @$(E) " LD " $@ -preauth_test: .config $(OBJS_t2) +preauth_test: $(OBJS_t2) $(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS) @$(E) " LD " $@