From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00C80C4332F for ; Sat, 30 Oct 2021 16:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D473E60EB2 for ; Sat, 30 Oct 2021 16:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230086AbhJ3QES (ORCPT ); Sat, 30 Oct 2021 12:04:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231199AbhJ3QER (ORCPT ); Sat, 30 Oct 2021 12:04:17 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:fb7d:d6d6:e0:4cff:fe83:e514]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37935C061714 for ; Sat, 30 Oct 2021 09:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=d7YYeVwYLvmoNjdOTzGlNW70LUbZrOQu9H8r0+vayQw=; b=MRq6IQVh/ZPZoqEerVodKB2Co6 GKOlPiRKSYf7cyvYYBYn8mcIyU1F7Yk6LS4V0h6pKbHFsaBQnrtr0HmvdaRk2R0VCLz3jdwUpAmcg wQVuJlDnJq59WFtHa3Oa3pTG8NbkQwSFpeLokts/xIu0IXu3nradiX6FmBk+r9cKff4wNZX35rDNv R30epl/qhFZX8NM/jfwE6z4lRwPthNj0O0zBMvZ2SiMprKiVMzx9qozLRkPq2ZbC3EfQObxW9Bunb gjFBLD+3oGt3FvC63AMURe5Bo+xVgq9Zw0rI+8CRmBkSwK7UQMr0fU31dlMvY7JhlU2eSEwdLEAa1 J6OhDJLQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] helo=ulthar.scientificgames.com) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mgqnf-00AFQk-RW for netfilter-devel@vger.kernel.org; Sat, 30 Oct 2021 17:01:43 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [ulogd2 PATCH 05/13] build: move cpp flag to the only Makefile.am file where it's needed Date: Sat, 30 Oct 2021 17:01:33 +0100 Message-Id: <20211030160141.1132819-6-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211030160141.1132819-1-jeremy@azazel.net> References: <20211030160141.1132819-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jeremy Sowden --- configure.ac | 2 +- src/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4e502171292e..1d795bad325d 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ AC_ARG_WITH([ulogd2libdir], [ulogd2libdir="${libdir}/ulogd"]) AC_SUBST([ulogd2libdir]) -regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter -DULOGD2_LIBDIR=\\\"\${ulogd2libdir}\\\""; +regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter"; AC_SUBST([regular_CFLAGS]) dnl AC_SUBST(DATABASE_DIR) diff --git a/src/Makefile.am b/src/Makefile.am index 998e776a8079..e1d45aee4b6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ - -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \ - -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\"" + -DULOGD_CONFIGFILE='"$(sysconfdir)/ulogd.conf"' \ + -DULOGD_LOGFILE_DEFAULT='"$(localstatedir)/log/ulogd.log"' \ + -DULOGD2_LIBDIR='"$(ulogd2libdir)"' AM_CFLAGS = ${regular_CFLAGS} sbin_PROGRAMS = ulogd -- 2.33.0