Merge pull request bumptech#69 from bfg/config_file

Added configuration file support.
bfg · Feb 24, 2012 · 8cff14c · 8cff14c
2 parents 17918b7 + 8f8c65b
commit 8cff14c
Show file tree

Hide file tree

Showing 6 changed files with 1,345 additions and 462 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
-conf*
+conf
 ebtree*
+core
+core.*
+*.o
+stud
diff --git a/Makefile b/Makefile
@@ -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)