summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-16 08:56:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-16 08:56:48 +0200
commit3af28bbd2dc4c79b242aad3b9e3f45cffe0f19d0 (patch)
tree6b132af0bfb750b080ce296faa015779e8444bd3
parentd7f33053da7eb73a8c475956af6e3847e596c80a (diff)
downloadrsyslog-3af28bbd2dc4c79b242aad3b9e3f45cffe0f19d0.tar.gz
rsyslog-3af28bbd2dc4c79b242aad3b9e3f45cffe0f19d0.tar.xz
rsyslog-3af28bbd2dc4c79b242aad3b9e3f45cffe0f19d0.zip
moved runtime files into their own directory
-rw-r--r--Makefile.am37
-rw-r--r--configure.ac2
-rw-r--r--runtime/Makefile.am42
-rw-r--r--runtime/ctok.c (renamed from ctok.c)0
-rw-r--r--runtime/ctok.h (renamed from ctok.h)0
-rw-r--r--runtime/ctok_token.c (renamed from ctok_token.c)0
-rw-r--r--runtime/ctok_token.h (renamed from ctok_token.h)0
-rw-r--r--runtime/expr.c (renamed from expr.c)0
-rw-r--r--runtime/expr.h (renamed from expr.h)0
-rw-r--r--runtime/regexp.c (renamed from regexp.c)0
-rw-r--r--runtime/regexp.h (renamed from regexp.h)0
-rw-r--r--runtime/stream.c (renamed from stream.c)0
-rw-r--r--runtime/stream.h (renamed from stream.h)0
-rw-r--r--runtime/sync.c (renamed from sync.c)0
-rw-r--r--runtime/sync.h (renamed from sync.h)0
-rw-r--r--runtime/sysvar.c (renamed from sysvar.c)0
-rw-r--r--runtime/sysvar.h (renamed from sysvar.h)0
-rw-r--r--runtime/var.c (renamed from var.c)0
-rw-r--r--runtime/var.h (renamed from var.h)0
-rw-r--r--runtime/vm.c (renamed from vm.c)0
-rw-r--r--runtime/vm.h (renamed from vm.h)0
-rw-r--r--runtime/vmop.c (renamed from vmop.c)0
-rw-r--r--runtime/vmop.h (renamed from vmop.h)0
-rw-r--r--runtime/vmprg.c (renamed from vmprg.c)0
-rw-r--r--runtime/vmprg.h (renamed from vmprg.h)0
-rw-r--r--runtime/vmstk.c (renamed from vmstk.c)0
-rw-r--r--runtime/vmstk.h (renamed from vmstk.h)0
-rw-r--r--runtime/wti.c (renamed from wti.c)0
-rw-r--r--runtime/wti.h (renamed from wti.h)0
-rw-r--r--runtime/wtp.c (renamed from wtp.c)0
-rw-r--r--runtime/wtp.h (renamed from wtp.h)0
31 files changed, 41 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am
index c2685963..a4d1ea5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,6 @@ rsyslogd_SOURCES = \
errmsg.h \
syslogd.c \
syslogd.h \
- sysvar.c \
- sysvar.h \
- vm.c \
- vm.h \
- vmstk.c \
- vmstk.h \
- vmprg.c \
- vmprg.h \
- vmop.c \
- vmop.h \
debug.c \
debug.h \
glbl.h \
@@ -39,27 +29,11 @@ rsyslogd_SOURCES = \
liblogging-stub.h \
threads.c \
threads.h \
- stream.c \
- stream.h \
- var.c \
- var.h \
- wtp.c \
- wtp.h \
- wti.c \
- wti.h \
- sync.c \
- sync.h \
obj.c \
obj.h \
obj-types.h \
msg.c \
msg.h \
- expr.c \
- expr.h \
- ctok.c \
- ctok.h \
- ctok_token.c \
- ctok_token.h \
conf.c \
conf.h \
omshell.c \
@@ -143,17 +117,6 @@ lmtcpclt_la_LIBADD =
endif # if ENABLE_INET
#
-# regular expression support
-#
-if ENABLE_REGEXP
-pkglib_LTLIBRARIES += lmregexp.la
-lmregexp_la_SOURCES = regexp.c regexp.h
-lmregexp_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
-lmregexp_la_LDFLAGS = -module -avoid-version $(rsrt_libs)
-lmregexp_la_LIBADD =
-endif
-
-#
# gssapi support
#
if ENABLE_GSSAPI
diff --git a/configure.ac b/configure.ac
index b0cc3e2e..8ea017ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -677,6 +677,6 @@ echo "Debug mode enabled: $enable_debug"
echo "Runtime Instrumentation enabled: $enable_rtinst"
echo "openssl enabled: $enable_openssl"
echo "valgrind support settings enabled: $enable_valgrind"
-echo "rsyslogd runtime will be built: $enable_rsyslogrt"
+echo "rsyslog runtime will be built: $enable_rsyslogrt"
echo "rsyslogd will be built: $enable_rsyslogd"
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 813a4c68..cd8a19c2 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,7 +1,35 @@
+sbin_PROGRAMS =
+man_MANS =
noinst_LTLIBRARIES = librsyslog.la
#pkglib_LTLIBRARIES = librsyslog.la
librsyslog_la_SOURCES = \
+ sync.c \
+ sync.h \
+ expr.c \
+ expr.h \
+ ctok.c \
+ ctok.h \
+ ctok_token.c \
+ ctok_token.h \
+ stream.c \
+ stream.h \
+ var.c \
+ var.h \
+ wtp.c \
+ wtp.h \
+ wti.c \
+ wti.h \
+ sysvar.c \
+ sysvar.h \
+ vm.c \
+ vm.h \
+ vmstk.c \
+ vmstk.h \
+ vmprg.c \
+ vmprg.h \
+ vmop.c \
+ vmop.h \
queue.c \
queue.h
@@ -9,5 +37,15 @@ librsyslog_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
#librsyslog_la_LDFLAGS = -module -avoid-version
librsyslog_la_LIBADD =
-sbin_PROGRAMS =
-man_MANS =
+#
+# regular expression support
+#
+if ENABLE_REGEXP
+noinst_LTLIBRARIES += lmregexp.la
+#pkglib_LTLIBRARIES += lmregexp.la
+lmregexp_la_SOURCES = regexp.c regexp.h
+lmregexp_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
+lmregexp_la_LDFLAGS = -module -avoid-version $(rsrt_libs)
+lmregexp_la_LIBADD =
+endif
+
diff --git a/ctok.c b/runtime/ctok.c
index 98d5b63b..98d5b63b 100644
--- a/ctok.c
+++ b/runtime/ctok.c
diff --git a/ctok.h b/runtime/ctok.h
index 591f0838..591f0838 100644
--- a/ctok.h
+++ b/runtime/ctok.h
diff --git a/ctok_token.c b/runtime/ctok_token.c
index 0f340675..0f340675 100644
--- a/ctok_token.c
+++ b/runtime/ctok_token.c
diff --git a/ctok_token.h b/runtime/ctok_token.h
index 346d5acd..346d5acd 100644
--- a/ctok_token.h
+++ b/runtime/ctok_token.h
diff --git a/expr.c b/runtime/expr.c
index 9c357404..9c357404 100644
--- a/expr.c
+++ b/runtime/expr.c
diff --git a/expr.h b/runtime/expr.h
index 974b71ec..974b71ec 100644
--- a/expr.h
+++ b/runtime/expr.h
diff --git a/regexp.c b/runtime/regexp.c
index 86b3e6c4..86b3e6c4 100644
--- a/regexp.c
+++ b/runtime/regexp.c
diff --git a/regexp.h b/runtime/regexp.h
index 8f6ac891..8f6ac891 100644
--- a/regexp.h
+++ b/runtime/regexp.h
diff --git a/stream.c b/runtime/stream.c
index 1be4571a..1be4571a 100644
--- a/stream.c
+++ b/runtime/stream.c
diff --git a/stream.h b/runtime/stream.h
index 371358ab..371358ab 100644
--- a/stream.h
+++ b/runtime/stream.h
diff --git a/sync.c b/runtime/sync.c
index a3053e28..a3053e28 100644
--- a/sync.c
+++ b/runtime/sync.c
diff --git a/sync.h b/runtime/sync.h
index 57144fee..57144fee 100644
--- a/sync.h
+++ b/runtime/sync.h
diff --git a/sysvar.c b/runtime/sysvar.c
index 14e32b96..14e32b96 100644
--- a/sysvar.c
+++ b/runtime/sysvar.c
diff --git a/sysvar.h b/runtime/sysvar.h
index 35051b64..35051b64 100644
--- a/sysvar.h
+++ b/runtime/sysvar.h
diff --git a/var.c b/runtime/var.c
index 7e51fc6d..7e51fc6d 100644
--- a/var.c
+++ b/runtime/var.c
diff --git a/var.h b/runtime/var.h
index bbe7ba33..bbe7ba33 100644
--- a/var.h
+++ b/runtime/var.h
diff --git a/vm.c b/runtime/vm.c
index bcd331ec..bcd331ec 100644
--- a/vm.c
+++ b/runtime/vm.c
diff --git a/vm.h b/runtime/vm.h
index d2458220..d2458220 100644
--- a/vm.h
+++ b/runtime/vm.h
diff --git a/vmop.c b/runtime/vmop.c
index 219315c4..219315c4 100644
--- a/vmop.c
+++ b/runtime/vmop.c
diff --git a/vmop.h b/runtime/vmop.h
index 97f924d7..97f924d7 100644
--- a/vmop.h
+++ b/runtime/vmop.h
diff --git a/vmprg.c b/runtime/vmprg.c
index a2b744d7..a2b744d7 100644
--- a/vmprg.c
+++ b/runtime/vmprg.c
diff --git a/vmprg.h b/runtime/vmprg.h
index db1f62f0..db1f62f0 100644
--- a/vmprg.h
+++ b/runtime/vmprg.h
diff --git a/vmstk.c b/runtime/vmstk.c
index 1ee3d485..1ee3d485 100644
--- a/vmstk.c
+++ b/runtime/vmstk.c
diff --git a/vmstk.h b/runtime/vmstk.h
index 2d45ee4d..2d45ee4d 100644
--- a/vmstk.h
+++ b/runtime/vmstk.h
diff --git a/wti.c b/runtime/wti.c
index 82cd2165..82cd2165 100644
--- a/wti.c
+++ b/runtime/wti.c
diff --git a/wti.h b/runtime/wti.h
index b3d92473..b3d92473 100644
--- a/wti.h
+++ b/runtime/wti.h
diff --git a/wtp.c b/runtime/wtp.c
index fcc7589c..fcc7589c 100644
--- a/wtp.c
+++ b/runtime/wtp.c
diff --git a/wtp.h b/runtime/wtp.h
index 13ebe536..13ebe536 100644
--- a/wtp.h
+++ b/runtime/wtp.h