From patchwork Sat Oct 30 16:01:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1548534 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=aeVSsFgU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HhPDy3nqYz9shn for ; Sun, 31 Oct 2021 03:01:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbhJ3QEV (ORCPT ); Sat, 30 Oct 2021 12:04:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231974AbhJ3QER (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 69AB2C0613F5 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=jvv5gM0kLu5MMMswnfK+X2akYrynZcnjOaOUJZ8GaSg=; b=aeVSsFgUCw+fDV0+TqhV2U0npP YkU4q5FQ2BY8ITb5k2aBVvtIYifVF15V7QH21mcMyeN5gwdnRyNtQKXFANDp7A2Gqt9JrUpZ7JaKN ZCgiAf7+ar7TUD/W7PCtgK3bi8umwEX2kjFpsiAMGb7xcx7GP6ZBYsArfFxTGbz+IFUDLGcS7c+JR 6rbgxurYSUxqSZ3H4JCttOWZf3N3rysit4KBn28hnOJYpAsgRBpW9lBkUCJ1uM8YCHJLPEiOHV7sR qqJrjmerYMuB/VSHB7bHSoXTHAzX/RTEAlIfBXmgZlPNu78Q10miHvsiis6ukZGon9t9gmrfOvfgy oM0WZXtw==; 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-Lk for netfilter-devel@vger.kernel.org; Sat, 30 Oct 2021 17:01:43 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [ulogd2 PATCH 03/13] build: remove unused Makefile fragment Date: Sat, 30 Oct 2021 17:01:31 +0100 Message-Id: <20211030160141.1132819-4-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 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 --- .gitignore | 1 - Rules.make.in | 43 ------------------------------------------- configure.ac | 2 +- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Rules.make.in diff --git a/.gitignore b/.gitignore index fd2189de5748..10769b427fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ Makefile Makefile.in # this dir -/Rules.make /ulogd.conf # build system diff --git a/Rules.make.in b/Rules.make.in deleted file mode 100644 index 21b05d9ca6ff..000000000000 --- a/Rules.make.in +++ /dev/null @@ -1,43 +0,0 @@ -# - -PREFIX=@prefix@ -exec_prefix=@exec_prefix@ -ETCDIR=@sysconfdir@ -BINDIR=@sbindir@ - -ULOGD_CONFIGFILE=@sysconfdir@/ulogd.conf - -ULOGD_LIB_PATH=@libdir@/ulogd - -# Path of libipulog (from iptables) -LIBIPULOG=@top_srcdir@/libipulog -INCIPULOG=-I@top_srcdir@/libipulog/include -INCCONFFILE=-I@top_srcdir@/conffile - -CC=@CC@ -LD=@LD@ -INSTALL=@INSTALL@ - -CFLAGS=@CFLAGS@ @CPPFLAGS@ -Wall -CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\" -# doesn't work for subdirs -#CFLAGS+=$(INCIPULOG) $(INCCONFFILE) -CFLAGS+=-I/lib/modules/`uname -r`/build/include -#CFLAGS+=@DEFS@ -#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL - -LIBS=@LIBS@ - - -# Names of the plugins to be compiled -ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL SYSLOG - -# mysql output support -#ULOGD_SL+=MYSQL -MYSQL_CFLAGS=-I@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@ -MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @MYSQL_LIB@ - -# postgreSQL output support -#ULOGD_SL+=PGSQL -PGSQL_CFLAGS=-I@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@ -PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @PGSQL_LIB@ diff --git a/configure.ac b/configure.ac index 48b4995f148c..e341ad12a159 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefi filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \ output/dbi/Makefile output/ipfix/Makefile \ - src/Makefile Makefile Rules.make) + src/Makefile Makefile) AC_OUTPUT define([EXPAND_VARIABLE],