diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2021-11-14 15:52:19 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-11-15 11:42:41 +0100 |
| commit | 0c0544be20fdc6ca7636e30b94d685117dc0af07 (patch) | |
| tree | 0429e4ea97725391da6293a11e6b9311e2a0ce9d | |
| parent | ac637dcde4167f6c7c6146042af7cc64338320b5 (diff) | |
build: remove unused Makefile fragment
Rules.make.in contains a number of variables defined by configure. It
is left-over from the pre-Automake build-system, in which it used to
fill a similar role to Make_global.am. It is no longer used anywhere.
Remove it.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Rules.make.in | 43 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 1 insertions, 45 deletions
@@ -12,7 +12,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 21b05d9..0000000 --- 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 48b4995..e341ad1 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], |