From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [ulogd2 PATCH 03/13] build: remove unused Makefile fragment
Date: Sat, 30 Oct 2021 17:01:31 +0100 [thread overview]
Message-ID: <20211030160141.1132819-4-jeremy@azazel.net> (raw)
In-Reply-To: <20211030160141.1132819-1-jeremy@azazel.net>
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
.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],
--
2.33.0
next prev parent reply other threads:[~2021-10-30 16:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 01/13] gitignore: Add Emacs artefacts Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp Jeremy Sowden
2021-10-30 17:05 ` Jan Engelhardt
2021-11-06 11:06 ` Jeremy Sowden
2021-10-30 16:01 ` Jeremy Sowden [this message]
2021-10-30 16:01 ` [ulogd2 PATCH 04/13] build: remove empty filter sub-directory Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 05/13] build: move cpp flag to the only Makefile.am file where it's needed Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 06/13] build: add Make_global.am for common flags and include it where necessary Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 07/13] build: use `dist_man_MANS` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 08/13] build: only conditionally enter sub-directories containing optional code Jeremy Sowden
2021-10-30 17:15 ` Jan Engelhardt
2021-11-06 11:06 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 09/13] build: move library dependencies from LDFLAGS to LIBADD Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 10/13] build: update obsolete autoconf macros Jeremy Sowden
2021-10-30 17:16 ` Jan Engelhardt
2021-11-06 11:07 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 11/13] build: quote and reformat some autoconf macro arguments Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 12/13] build: reformat autoconf AC_ARG_WITH, AC_ARG_ENABLE and related macros Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71 Jeremy Sowden
2021-10-30 17:21 ` Jan Engelhardt
2021-11-06 11:07 ` Jeremy Sowden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211030160141.1132819-4-jeremy@azazel.net \
--to=jeremy@azazel.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).