From patchwork Wed Sep 28 21:40:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 9355071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2D2B6077A for ; Wed, 28 Sep 2016 21:41:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A202D2956B for ; Wed, 28 Sep 2016 21:41:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92B95295F9; Wed, 28 Sep 2016 21:41:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (emsm-gh1-uea11.nsa.gov [8.44.101.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A49862956B for ; Wed, 28 Sep 2016 21:41:03 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.30,411,1470700800"; d="scan'208";a="19646288" IronPort-PHdr: =?us-ascii?q?9a23=3AGwt3Rh9ntdDcKP9uRHKM819IXTAuvvDOBiVQ1KB9?= =?us-ascii?q?1ukcTK2v8tzYMVDF4r011RmSDN+dsq0P0reO+4nbGkU4qa6bt34DdJEeHzQksu?= =?us-ascii?q?4x2zIaPcieFEfgJ+TrZSFpVO5LVVti4m3peRMNQJW2WVTerzWI4CIIHV2nbEwu?= =?us-ascii?q?d76zQ9GZ1pnvn8mJuLTrKz1SgzS8Zb4gZD6Xli728vcsvI15N6wqwQHIqHYbM8?= =?us-ascii?q?5fxGdvOE7B102kvpT4wYRnuxh0l7phspcYEPayQ6NtVrFcDTI7I0gp9cbrsl/F?= =?us-ascii?q?VgLJ6XwCAUsMlR8dJQnO6xXzRd/QtSzhraIp3iiROsn/VvY1XjO59I9uFA+ujz?= =?us-ascii?q?0IYW1quFrLg9B92foI6CmqoAZylsuNOIw=3D?= X-IPAS-Result: =?us-ascii?q?A2HAEAAVOOxX/wHyM5BdHRgHCgEBFgEBCwEBgwIBAQEBAR5?= =?us-ascii?q?XfKYkAZQnIgOBeIVqTAEBAQEBAQEBAgECWyeCMgQDEwV5W0QCNxQgDgMJAhcpC?= =?us-ascii?q?AgDAS0VHwsFGASILAQBtXuHXYY3iGoRAWiEdR0FlB6FWIFlhEKJOoJGh0GFb5B?= =?us-ascii?q?pVIMdHIFScIUSeIEoAQEB?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 28 Sep 2016 21:41:01 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SLemEB011304; Wed, 28 Sep 2016 17:40:52 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u8SLelJR005171 for ; Wed, 28 Sep 2016 17:40:47 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SLekPp011302 for ; Wed, 28 Sep 2016 17:40:47 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1AKAgAVOOxXhyIeaIFdHRgHBoMtAQEBAQF1fKR6kUaEKQiHYkwBAgEBAQEBAhMBAQEKCwkJGYdhiE0EAaBElTeHXYY3iWSEdR0FlB6FWIFlhEKJOoJGjTCQaYMhAQsBQxyBUnCHMgEBAQ X-IPAS-Result: A1AKAgAVOOxXhyIeaIFdHRgHBoMtAQEBAQF1fKR6kUaEKQiHYkwBAgEBAQEBAhMBAQEKCwkJGYdhiE0EAaBElTeHXYY3iWSEdR0FlB6FWIFlhEKJOoJGjTCQaYMhAQsBQxyBUnCHMgEBAQ X-IronPort-AV: E=Sophos;i="5.30,411,1470715200"; d="scan'208";a="5734839" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 28 Sep 2016 17:40:45 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AchpqGh3yXWexvchUsmDT+DRfVm0co7zxezQtwd8Z?= =?us-ascii?q?segVIvad9pjvdHbS+e9qxAeQG96KsbQd1KGP7viocFdDyK7JiGoFfp1IWk1Nou?= =?us-ascii?q?QttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXsq3G/pQQfBg/4fVIs?= =?us-ascii?q?YL+kQMiL0I/uirj60qaQSj0AvCC6b7J2IUf+hiTqne5Sv7FfLL0swADCuHpCdr?= =?us-ascii?q?ce72ppIVWOg0S0vZ/or9YwuxhX7uks889GTLXSY7UzTbseCi8vdW8y+p7Frx7G?= =?us-ascii?q?GC2O7XwYW35esx1PGBONuBf7VZD1uzC8t+16wzKyOJHmC7cuVmLxvO9QVBb0hX?= =?us-ascii?q?JfZHYC+2bNh5kogQ=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0GQBwDRN+xXhyIeaIFdHQEXAQYBBQECA?= =?us-ascii?q?QEBARQBAQEBBQEBAgEBAQGDAQEBAQEBdXykeoErkBuEKQiBeIVqTAEBAQEBAQE?= =?us-ascii?q?BAgECEAEBAQoLCQkZL4IyGIEAW4MNiE0EAaBElTeHXYY3iWSEdR0FlB6FWIFlh?= =?us-ascii?q?EKJOoJGjTCQaYMhAQsBQxyBUnCHMgEBAQ?= X-IPAS-Result: =?us-ascii?q?A0GQBwDRN+xXhyIeaIFdHQEXAQYBBQECAQEBARQBAQEBBQE?= =?us-ascii?q?BAgEBAQGDAQEBAQEBdXykeoErkBuEKQiBeIVqTAEBAQEBAQEBAgECEAEBAQoLC?= =?us-ascii?q?QkZL4IyGIEAW4MNiE0EAaBElTeHXYY3iWSEdR0FlB6FWIFlhEKJOoJGjTCQaYM?= =?us-ascii?q?hAQsBQxyBUnCHMgEBAQ?= X-IronPort-AV: E=Sophos;i="5.30,411,1470700800"; d="scan'208";a="18080687" Received: from mx1.polytechnique.org ([129.104.30.34]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Sep 2016 21:40:44 +0000 Received: from localhost.localdomain (32.206.133.77.rev.sfr.net [77.133.206.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 1185B56078B for ; Wed, 28 Sep 2016 23:40:43 +0200 (CEST) From: Nicolas Iooss To: selinux@tycho.nsa.gov Subject: [PATCH 1/1] Makefile: make distclean target work Date: Wed, 28 Sep 2016 23:40:32 +0200 Message-Id: <20160928214032.22092-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.10.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Wed Sep 28 23:40:43 2016 +0200 (CEST)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP A mispelling in the Makefile in the root directory prevented "make distclean" to go into subdirectories. In libsemanage/src/, semanageswig_python_exception.i was not cleaned by "make distclean" because the target did not use $(GENERATED) and this variable was being redefined in the Makefile. Fix these two bugs. Signed-off-by: Nicolas Iooss --- Makefile | 2 +- libsemanage/src/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 93e10dee4820..bed16498d0e7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SUBDIRS=libsepol libselinux libsemanage sepolgen checkpolicy secilc policycoreutils # policy PYSUBDIRS=libselinux libsemanage -DISTCLEANSUBIDRS=libselinux libsemanage +DISTCLEANSUBDIRS=libselinux libsemanage ifeq ($(DEBUG),1) export CFLAGS = -g3 -O0 -gdwarf-2 -fno-strict-aliasing -Wall -Wshadow -Werror diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index 96ee652d06a9..68aab72cb619 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -51,7 +51,7 @@ SWIGFILES=$(SWIGSO) semanage.py SWIGRUBYSO=$(RUBYPREFIX)_semanage.so LIBSO=$(TARGET).$(LIBVERSION) -GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) semanageswig_python_exception.i +GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) semanageswig_python_exception.i $(wildcard conf-*.[ch]) SRCS= $(filter-out $(GENERATED),$(sort $(wildcard *.c))) OBJS= $(patsubst %.c,%.o,$(SRCS)) conf-scan.o conf-parse.o @@ -68,8 +68,6 @@ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ -GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(wildcard conf-*.[ch]) - all: $(LIBA) $(LIBSO) $(LIBPC) pywrap: all $(SWIGSO) @@ -163,7 +161,7 @@ clean: -rm -f $(LIBPC) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) conf-parse.c conf-parse.h conf-scan.c *.o *.lo *~ distclean: clean - rm -f $(SWIGCOUT) $(SWIGFILES) + rm -f $(GENERATED) $(SWIGFILES) indent: ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch]))