Permalink
Browse files

Merge pull request #69 from bfg/config_file

Added configuration file support.
  • Loading branch information...
2 parents 17918b7 + 8f8c65b commit 8cff14c941795ef2ee2b7a7c329ec7b685c50c40 Jamie Turner committed Feb 24, 2012
Showing with 1,345 additions and 462 deletions.
  1. +5 −1 .gitignore
  2. +6 −1 Makefile
  3. +1,178 −0 configuration.c
  4. +67 −0 configuration.h
  5. +88 −460 stud.c
  6. +1 −0 version.h
View
@@ -1,2 +1,6 @@
-conf*
+conf
ebtree*
+core
+core.*
+*.o
+stud
View
@@ -9,7 +9,7 @@ MANDIR = $(PREFIX)/share/man
CFLAGS = -O2 -g -std=c99 -fno-strict-aliasing -Wall -W -D_GNU_SOURCE
LDFLAGS = -lssl -lcrypto -lev
-OBJS = stud.o ringbuffer.o
+OBJS = stud.o ringbuffer.o configuration.o
all: realall
@@ -28,6 +28,11 @@ ebtree:
exit 1 )
endif
+# No config file support?
+ifneq ($(NO_CONFIG_FILE),)
+CFLAGS += -DNO_CONFIG_FILE
+endif
+
ALL += stud
realall: $(ALL)
Oops, something went wrong.

0 comments on commit 8cff14c

Please sign in to comment.