Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx> --- .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
