From 7f21dbbe30500b2b9febd47a26ccdd959ed536a6 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 13 Jul 2007 06:21:22 +0000 Subject: removed old build system --- debian/Makefile | 1 - freebsd/Makefile | 111 ------------------------------------------------- linux/Makefile | 118 ----------------------------------------------------- master.make | 105 ----------------------------------------------- redhat/Makefile | 1 - slackware/Makefile | 1 - solaris/Makefile | 116 ---------------------------------------------------- 7 files changed, 453 deletions(-) delete mode 100644 debian/Makefile delete mode 100644 freebsd/Makefile delete mode 100644 linux/Makefile delete mode 100644 master.make delete mode 100644 redhat/Makefile delete mode 100644 slackware/Makefile delete mode 100644 solaris/Makefile diff --git a/debian/Makefile b/debian/Makefile deleted file mode 100644 index 7ee2460a..00000000 --- a/debian/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../linux/Makefile diff --git a/freebsd/Makefile b/freebsd/Makefile deleted file mode 100644 index 5bb65238..00000000 --- a/freebsd/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -# Makefile for rsyslog -# Copyright (C) 2004-2007 Rainer Gerhards and Adiscon GmbH -# This is the distro-specifc part of the Makefile. -# For details, see http://www.rsyslog.com/doc - -############################################################# -# USER SETTINGS # -# ------------- # -# The following lines allow you to customize the way # -# rsyslog is build. All variables take a value of 0 or zero # -# with 1 meaning true and 0 meaning false (in most cases # -# equivalent to "disabled"). If you need to customize any- # -# thing do it here - and stay away from all other parts # -# of this file! # -# # -# IMPORTANT: after you have made changes, run "make clean" # -# before any other command! # -############################################################# - -# Enable large file support (typically on, not needed on -# 64 bit operating systems) -FEATURE_LARGEFILE=1 - -# Enable database support (off by default, must be turned -# on when support for MySQL is desired). -FEATURE_DB=1 - -# Enable regular expressions -FEATURE_REGEXP=1 - -# Enable RFC 3195 support (REQUIRES LIBLOGGING 0.6.0 or above!) -FEATURE_RFC3195=0 - -# Enable multithreading via pthreads (experimental!) -FEATURE_PTHREADS=1 - -# Enable zlib compression -# Depending on the messages, turning zlib compression on -# results in moderate savings of network traffic. -FEATURE_NETZIP=1 - -# For Freebsd, we disable klogd -FEATURE_KLOGD=0 - -# Enable debug mode (much slower code) -FEATURE_DEBUG=0 - -# The following defines tell us where liblogging is located. This -# is only needed if we build with RFC 3195 support. By default, -# liblogging is expected to be present in the our parent directory. -# -# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH -# RFC 3195 SUPPORT! -LIBLOGGING_INC=-I../../liblogging/src -LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a - -############################################################# -# END OF USER SETTINGS # -# -------------------- # -# DO NOT MAKE ANY MODIFICATIONS BELOW THIS POINT! # -############################################################# - -INSTALL = install -BINDIR = /usr/sbin -MANDIR = /usr/share/man - - -# now comes the evaluation of the FEATURE_* settings -.if $(FEATURE_LARGEFILE) == 0 - NOLARGEFILE = -DNOLARGEFILE -.endif - -.if $(FEATURE_DB) == 1 - WITHDB=-DWITH_DB -.endif - -.if $(FEATURE_KLOGD) == 1 - FEATKLOGD=-DFEATURE_KLOGD -.endif - -.if $(FEATURE_NETZIP) == 1 - NETZIP=-DWITH_DB -.endif - -.if $(FEATURE_REGEXP) == 1 - F_REGEXP=-DFEATURE_REGEXP -.endif - -.if $(FEATURE_RFC3195) == 1 - F_RFC3195=-DFEATURE_RFC3195 -.else - LIBLOGGING_INC= - LIBLOGGING_BIN= -.endif - -.if $(FEATURE_PTHREADS) == 1 - F_PTHREADS=-DUSE_PTHREADS - LPTHREAD=-lpthread -.endif - -.if $(FEATURE_DEBUG) == 0 - DBG=-DNDEBUG -.endif - -# Include MySQL client lib if DB is selected -.ifdef WITHDB -LIBS = -lmysqlclient -L/usr/local/lib/mysql -.endif - -VPATH = ../ -.include "../master.make" diff --git a/linux/Makefile b/linux/Makefile deleted file mode 100644 index 5bd22e06..00000000 --- a/linux/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# Makefile for rsyslog -# Copyright (C) 2004-2007 Rainer Gerhards and Adiscon GmbH -# This is the distro-specific part of the Makefile. -# This makefile here should be suitable for all flavours -# of linux. -# For details, see http://www.rsyslog.com/doc - -############################################################# -# USER SETTINGS # -# ------------- # -# The following lines allow you to customize the way # -# rsyslog is build. All variables take a value of 0 or zero # -# with 1 meaning true and 0 meaning false (in most cases # -# equivalent to "disabled"). If you need to customize any- # -# thing do it here - and stay away from all other parts # -# of this file! # -# # -# IMPORTANT: after you have made changes, run "make clean" # -# before any other command! # -############################################################# - -# Enable large file support (typically on, not needed for -# 64 bit operating systems) -FEATURE_LARGEFILE=1 - -# Enable database support (off by default, must be turned -# on when support for MySQL is desired). -FEATURE_DB=0 - -# Enable regular expressions -FEATURE_REGEXP=1 - -# Enable zlib compression -# Depending on the messages, turning zlib compression on -# results in moderate savings of network traffic. -FEATURE_NETZIP=1 - -# Enable RFC 3195 support (REQUIRES LIBLOGGING 0.6.0 or above!) -FEATURE_RFC3195=0 - -# Enable multithreading via pthreads (experimental!) -FEATURE_PTHREADS=1 - -# This feature indicates if klogd functionality -# should be integrated. If it is switched off, klogd -# is still compiled, but it is an empty shell. -FEATURE_KLOGD=1 - -# Enable debug mode (much slower code) -FEATURE_DEBUG=0 - -# The following defines tell us where liblogging is located. This -# is only needed if we build with RFC 3195 support. By default, -# liblogging is expected to be present in the our parent directory. -# -# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH -# RFC 3195 SUPPORT! -LIBLOGGING_INC=-I../../liblogging-0.6.0/src -LIBLOGGING_BIN=../../liblogging-0.6.0/src/linux/liblogging.a - -############################################################# -# END OF USER SETTINGS # -# -------------------- # -# DO NOT MAKE ANY MODIFICATIONS BELOW THIS POINT! # -############################################################# - -INSTALL = install -BINDIR = /usr/sbin -MANDIR = /usr/share/man - -# now comes the evaluation of the FEATURE_* settings -ifeq ($(strip $(FEATURE_LARGEFILE)), 0) - NOLARGEFILE = -DNOLARGEFILE -endif - -ifeq ($(strip $(FEATURE_DB)), 1) - WITHDB=-DWITH_DB -endif - -ifeq ($(strip $(FEATURE_KLOGD)), 1) - FEATKLOGD=-DFEATURE_KLOGD -endif - -ifeq ($(strip $(FEATURE_REGEXP)), 1) - F_REGEXP=-DFEATURE_REGEXP -endif - -ifeq ($(strip $(FEATURE_NETZIP)), 1) - NETZIP=-DUSE_NETZIP - LZ=-lz -endif - -ifeq ($(strip $(FEATURE_PTHREADS)), 1) - F_PTHREADS=-DUSE_PTHREADS - LPTHREAD=-lpthread -endif - -ifeq ($(strip $(FEATURE_RFC3195)), 1) - F_RFC3195=-DFEATURE_RFC3195 -else - LIBLOGGING_INC= - LIBLOGGING_BIN= -endif - -ifeq ($(strip $(FEATURE_DEBUG)), 0) - DBG=-DNDEBUG -endif - -# Include MySQL client lib if DB is selected -ifdef WITHDB -# use the line below for Linux OTHER than Fedora -#LIBS = -lmysqlclient -L/usr/local/lib/mysql -# use the line below for Fedora -LIBS = -lmysqlclient -L/usr/lib/mysql -endif - -VPATH = ../ -include ../master.make diff --git a/master.make b/master.make deleted file mode 100644 index 8c3ab5df..00000000 --- a/master.make +++ /dev/null @@ -1,105 +0,0 @@ -# master makefile for rsyslog -# Copyright (C) 2004-2007 Rainer Gerhards and Adiscon GmbH -# This is the part of the makefile common to all distros. -# For details, see http://www.rsyslog.com/doc - -CC= gcc -#CFLAGS= -g -DSYSV -Wall -# Add the -DMTRACE macro if you would like to use mtrace() -# to hunt for memory leaks -# next 2 lines are debug settings -#LDFLAGS= -g -Wall -fno-omit-frame-pointer -#CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer - -CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I/usr/local/include $(NOLARGEFILE) $(WITHDB) $(F_REGEXP) $(DBG) $(F_RFC3195) $(F_PTHREADS) -#LDFLAGS= -s - -# There is one report that under an all ELF system there may be a need to -# explicilty link with libresolv.a. If linking syslogd fails you may wish -# to try uncommenting the following define. -# LIBS = /usr/lib/libresolv.a - -# The following define determines whether the package adheres to the -# file system standard. -FSSTND = -DFSSTND - -# The following define establishes the name of the pid file for the -# rsyslogd daemon. The library include file (paths.h) defines the -# name for the rsyslogd pid to be rsyslog.pid. -SYSLOGD_PIDNAME = -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" - -SYSLOGD_FLAGS= -DSYSLOG_INET -DSYSLOG_UNIXAF ${FSSTND} \ - ${SYSLOGD_PIDNAME} -SYSLOG_FLAGS= -DALLOW_KERNEL_LOGGING -KLOGD_FLAGS = ${FSSTND} ${KLOGD_START_DELAY} - -.c.o: - ${CC} ${CFLAGS} ${NETZIP} ${LIBLOGGING_INC} -c $(VPATH)$*.c - -all: klogd rfc3195d syslogd - -test: syslog_tst tsyslogd - -install: install_man install_exec - -syslogd: syslogd.o pidfile.o template.o stringbuf.o srUtils.o outchannel.o parse.o - ${CC} ${LDFLAGS} $(LPTHREAD) -o syslogd syslogd.o pidfile.o template.o outchannel.o stringbuf.o srUtils.o parse.o ${LIBS} ${LZ} ${EXTRALIB} - -rfc3195d: rfc3195d.o - ${CC} ${LDFLAGS} -o rfc3195d rfc3195d.o ${LIBLOGGING_BIN} - -srUtils.o: srUtils.c srUtils.h liblogging-stub.h rsyslog.h -stringbuf.o: stringbuf.c stringbuf.h rsyslog.h -parse.o: parse.c parse.h rsyslog.h -template.o: template.c template.h stringbuf.h rsyslog.h -outchannel.o: outchannel.c outchannel.h stringbuf.h syslogd.h rsyslog.h -rfc3195d.o: rfc3195d.c rsyslog.h - -syslogd.o: syslogd.c parse.h template.h stringbuf.h outchannel.h syslogd.h rsyslog.h - ${CC} ${CFLAGS} ${NETZIP} ${SYSLOGD_FLAGS} -c $(VPATH)syslogd.c - -klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o - ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ - ksym_mod.o ${LIBS} - -syslog.o: syslog.c - ${CC} ${CFLAGS} ${SYSLOG_FLAGS} -c $(VPATH)syslog.c - -klogd.o: klogd.c klogd.h - ${CC} ${CFLAGS} ${KLOGD_FLAGS} ${FEATKLOGD} $(DEB) -c $(VPATH)klogd.c - -ksym.o: ksym.c klogd.h - ${CC} ${CFLAGS} ${KLOGD_FLAGS} ${FEATKLOGD} -c $(VPATH)ksym.c - -ksym_mod.o: ksym_mod.c klogd.h - ${CC} ${CFLAGS} ${KLOGD_FLAGS} ${FEATKLOGD} -c $(VPATH)ksym_mod.c - -clean: - rm -f *.o *.log *~ *.orig syslogd rfc3195d - -clobber: clean - rm -f syslogd ksym syslog_tst oops_test TAGS tsyslogd tklogd - -install_exec: syslogd rfc3195d - ${INSTALL} -b klogd ${DESTDIR}${BINDIR}/rklogd - ${INSTALL} -b syslogd ${DESTDIR}${BINDIR}/rsyslogd - ${INSTALL} -b rfc3195d ${DESTDIR}${BINDIR}/rfc3195d - -install_man: - ${INSTALL} -m 644 $(VPATH)rfc3195d.8 ${DESTDIR}${MANDIR}/man8/rfc3195d.8 - ${INSTALL} -m 644 $(VPATH)rsyslogd.8 ${DESTDIR}${MANDIR}/man8/rsyslogd.8 - ${INSTALL} -m 644 $(VPATH)rklogd.8 ${DESTDIR}${MANDIR}/man8/rklogd.8 - ${INSTALL} -m 644 $(VPATH)rsyslog.conf.5 ${DESTDIR}${MANDIR}/man5/rsyslog.conf.5 - -# The following lines are some legacy from sysklogd, which we might need -# again in the future. So it is just commented out for now, eventually -# to be revived. rgerhards 2005-08-09 - -#syslog_tst: syslog_tst.o -# ${CC} ${LDFLAGS} -o syslog_tst syslog_tst.o - -#tsyslogd: syslogd.c syslogd.h version.h template.o outchannel.o stringbuf.o srUtils.o -# $(CC) $(CFLAGS) -g -DTESTING $(SYSLOGD_FLAGS) -o tsyslogd syslogd.c pidfile.o template.o outchannel.o stringbuf.o srUtils.o $(LIBS) -#syslog_tst.o: syslog_tst.c -# ${CC} ${CFLAGS} -c syslog_tst.c - diff --git a/redhat/Makefile b/redhat/Makefile deleted file mode 100644 index 7ee2460a..00000000 --- a/redhat/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../linux/Makefile diff --git a/slackware/Makefile b/slackware/Makefile deleted file mode 100644 index 7ee2460a..00000000 --- a/slackware/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../linux/Makefile diff --git a/solaris/Makefile b/solaris/Makefile deleted file mode 100644 index 57b75d31..00000000 --- a/solaris/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# Makefile for rsyslog -# Copyright (C) 2004-2007 Rainer Gerhards and Adiscon GmbH -# This is the Solaris part of the Makefile. -# For details, see http://www.rsyslog.com/doc -# -# C A U T I O N -# So far, I have just make sure that rsyslog compiles under -# Solaris. I have NOT used the RFC 3195 options, but that -# should work, too, as liblogging cleanly compiles under -# Solaris. I have done only very limited testing. From that, -# it *seems* to work, but Solaris support is still experimental. -# IT IS KNOWN THAT THE LOCAL LOG SOCKET SEEMS **NOT** TO WORK. -# This seems to be related to using a different interface for -# /dev/log than Linux and BSD. I am evaluating this problem, -# but for the time being rsyslogd seems to be unable to act -# as a local logger. But you can run it alongside the Solaris -# stock syslogd. -# -# I will only look into this issue if people show up that -# ask for local logging under Solaris. So please speak up -# if you would like to see it! -# - -############################################################# -# USER SETTINGS # -# ------------- # -# The following lines allow you to customize the way # -# rsyslog is build. All variables take a value of 0 or zero # -# with 1 meaning true and 0 meaning false (in most cases # -# equivalent to "disabled"). If you need to customize any- # -# thing do it here - and stay away from all other parts # -# of this file! # -# # -# IMPORTANT: after you have made changes, run "make clean" # -# before any other command! # -############################################################# - -# Enable large file support (typically on, not needed for -# 64 bit operating systems) -FEATURE_LARGEFILE=1 - -# Enable database support (off by default, must be turned -# on when support for MySQL is desired). -FEATURE_DB=0 - -# Enable regular expressions -FEATURE_REGEXP=1 - -# Enable RFC 3195 support (REQUIRES LIBLOGGING 0.6.0 or above!) -FEATURE_RFC3195=0 - -# Enable multithreading via pthreads (experimental!) -FEATURE_PTHREADS=1 - -# Enable debug mode (much slower code) -FEATURE_DEBUG=1 - -# The following defines tell us where liblogging is located. This -# is only needed if we build with RFC 3195 support. By default, -# liblogging is expected to be present in the our parent directory. -# -# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH -# RFC 3195 SUPPORT! -LIBLOGGING_INC=-I../../liblogging/src -LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a - -############################################################# -# END OF USER SETTINGS # -# -------------------- # -# DO NOT MAKE ANY MODIFICATIONS BELOW THIS POINT! # -############################################################# - -INSTALL = install -BINDIR = /usr/sbin -MANDIR = /usr/share/man - -# now comes the evaluation of the FEATURE_* settings -ifeq ($(strip $(FEATURE_LARGEFILE)), 0) - NOLARGEFILE = -DNOLARGEFILE -endif - -ifeq ($(strip $(FEATURE_DB)), 1) - WITHDB=-DWITH_DB -endif - -ifeq ($(strip $(FEATURE_REGEXP)), 1) - F_REGEXP=-DFEATURE_REGEXP -endif - -ifeq ($(strip $(FEATURE_PTHREADS)), 1) - F_PTHREADS=-DUSE_PTHREADS - LPTHREAD=-lpthread -endif - -ifeq ($(strip $(FEATURE_RFC3195)), 1) - F_RFC3195=-DFEATURE_RFC3195 -else - LIBLOGGING_INC= - LIBLOGGING_BIN= -endif - -ifeq ($(strip $(FEATURE_DEBUG)), 0) - DBG=-DNDEBUG -endif - -# Include MySQL client lib if DB is selected -ifdef WITHDB -LIBS = -lmysqlclient -L/usr/local/lib/mysql -endif - -# we use gcc under Solaris (mostly because that was the easiest for me ;)) -CC=gcc -EXTRALIB=-lsocket -lnsl - -VPATH = ../ -include ../master.make -- cgit