summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>1999-10-24 17:13:15 +0000
committerSimon Tatham <anakin@pobox.com>1999-10-24 17:13:15 +0000
commit3cb5a6f58a56ca01547558e7b4543bf98fc25e1b (patch)
tree4b14053c2ba02ea2b38ffff2c5ce6ddddc0d0885
parent2085f874f8ee88e8953a76c578f870cb6679534d (diff)
downloadhalibut-3cb5a6f58a56ca01547558e7b4543bf98fc25e1b.zip
halibut-3cb5a6f58a56ca01547558e7b4543bf98fc25e1b.tar.gz
halibut-3cb5a6f58a56ca01547558e7b4543bf98fc25e1b.tar.bz2
halibut-3cb5a6f58a56ca01547558e7b4543bf98fc25e1b.tar.xz
Test architecture changed
[originally from svn r251]
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 89843cc..8253d03 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,12 @@
# `make BUILDDIR=foo' from top level will build in directory foo
ifndef REALBUILD
ifndef BUILDDIR
+ifdef TEST
+BUILDDIR := test
+else
BUILDDIR := build
endif
+endif
all:
@test -d $(BUILDDIR) || mkdir $(BUILDDIR)
@make -C $(BUILDDIR) -f ../Makefile REALBUILD=yes
@@ -20,8 +24,9 @@ else
CFLAGS += -Wall -W
-ifdef LOGALLOC
+ifdef TEST
CFLAGS += -DLOGALLOC
+LIBS += -lefence
endif
ifdef RELEASE
@@ -51,7 +56,7 @@ OBJECTS := $(addsuffix .o,$(MODULES))
DEPS := $(addsuffix .d,$(MODULES))
buttress: $(OBJECTS)
- $(CC) $(LFLAGS) -o buttress $(OBJECTS)
+ $(CC) $(LFLAGS) -o buttress $(OBJECTS) $(LIBS)
%.o: $(SRC)%.c
$(CC) $(CFLAGS) -MD -c $<