diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2010-11-07 01:37:06 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2010-11-07 01:37:06 +0200 |
| commit | cb2db2f1c759c60849b66dabf8ee03c9cdfb2dd5 (patch) | |
| tree | 870455fc986e81816bd3631f4674b6dd49c30506 /src/Makefile | |
| parent | 660b77270e599fed9a8a6bc94a0e2d44b8f282dd (diff) | |
| download | squark-cb2db2f1c759c60849b66dabf8ee03c9cdfb2dd5.tar.bz2 squark-cb2db2f1c759c60849b66dabf8ee03c9cdfb2dd5.tar.xz | |
all: check error for sqdb_open and adb_open
so we don't crash on startup if essential files are missing.
fixes #454
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 5863414..eb24877 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,14 +2,16 @@ progs-y += squark-filter squark-auth-snmp squark-auth-ip shlibs-y += squarkdb.so scripts-y += sqdb-build.lua -common-objs += filterdb.o authdb.o blob.o addr.o +common-objs += filterdb.o authdb.o blob.o addr.o config.o squark-filter-objs += squark-filter.o $(common-objs) squark-auth-snmp-objs += squark-auth-snmp.o $(common-objs) squark-auth-ip-objs += squark-auth-ip.o $(common-objs) squarkdb.so-objs += lua-squarkdb.o filterdb.o blob.o -CFLAGS += -DSQUARK_VERSION=\"$(FULL_VERSION)\" +CFLAGS_config.o += -DSQUARK_VERSION=\"$(FULL_VERSION)\" \ + -DCONFDIR=\"$(CONFDIR)\" \ + -DLIBDIR=\"$(LIBDIR)\" LIBS += -lrt CFLAGS_lua-squarkdb.o += $(shell pkg-config --cflags lua5.1) @@ -22,4 +24,4 @@ install: $(INSTALL) $(addprefix $(obj)/,$(progs-y) $(scripts-y)) $(DESTDIR)$(BINDIR) $(INSTALLDIR) $(DESTDIR)$(LUALIBDIR) - $(INSTALL) $(addprefix $(obj)/,$(shlibs-y)) $(DESTDIR)$(LUALIBDIR)
\ No newline at end of file + $(INSTALL) $(addprefix $(obj)/,$(shlibs-y)) $(DESTDIR)$(LUALIBDIR) |