summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2013-12-10 07:36:51 -0800
committerKaz Kylheku <kaz@kylheku.com>2013-12-10 07:36:51 -0800
commit434ea4f4ce65a553205f4030a6b98268ff938f0f (patch)
tree5f60474635945f1c70af6c37c78b84f9a18d0180 /Makefile
parent5114624a14456ae20dc8c57f9ac8ed0a5a0661f4 (diff)
downloadtxr-434ea4f4ce65a553205f4030a6b98268ff938f0f.tar.gz
txr-434ea4f4ce65a553205f4030a6b98268ff938f0f.tar.bz2
txr-434ea4f4ce65a553205f4030a6b98268ff938f0f.zip
syslog support; bitwise logior and logand functions become variadic.
* Makefile: Use -iquote to restrict our #include search paths from being processed for #include <...>. Add syslog.o to OBJS-y if have_syslog is y. * configure (have_syslog): New variable, set by detecting syslog API. * eval.c (eval_init): logand and logior registrations changed to go to variadic versions. New syslog variables and functions registered. * lib.c (logandv, logiorv): New functions. * lib.h (logandv, logiorv): Declared. * txr.c (main): Call syslog_init. * syslog.c: New file. * syslog.h: New file.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ee5a20c4..7ad3e7c3 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,9 @@
include config.make
-CFLAGS := -I. -I$(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \
+CFLAGS := -iquote $(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \
$(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS) $(EXTRA_FLAGS)
-CFLAGS += -Impi-$(mpi_version)
+CFLAGS += -iquote mpi-$(mpi_version)
CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS))
ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC)))
@@ -40,7 +40,8 @@ endif
# TXR objects
OBJS := txr.o lex.yy.o y.tab.o match.o lib.o regex.o gc.o unwind.o stream.o
OBJS += arith.o hash.o utf8.o filter.o eval.o rand.o
-OBJS-$(debug_support) := debug.o
+OBJS-$(debug_support) += debug.o
+OBJS-$(have_syslog) += syslog.o
# MPI objects
MPI_OBJ_BASE=mpi.o mplogic.o