Index: Makefile --- Makefile.orig +++ Makefile @@ -1,5 +1,5 @@ -CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT -LIBS := -lm -lssl -lcrypto -lpthread +CFLAGS += -std=c99 -Wall -D_REENTRANT +LIBS += -lm -lssl -lcrypto -lpthread TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) @@ -15,6 +15,9 @@ else ifeq ($(TARGET), linux) else ifeq ($(TARGET), freebsd) CFLAGS += -D_DECLARE_C99_LDBL_MATH LDFLAGS += -Wl,-E +else ifeq ($(TARGET), openbsd) + CFLAGS += -D_DECLARE_C99_LDBL_MATH + LDFLAGS += -Wl,-E endif SRC := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \ @@ -31,7 +34,7 @@ CFLAGS += -I$(ODIR)/include LDFLAGS += -L$(ODIR)/lib ifneq ($(WITH_LUAJIT),) - CFLAGS += -I$(WITH_LUAJIT)/include + CFLAGS += -I$(WITH_LUAJIT)/include/luajit-2.0 LDFLAGS += -L$(WITH_LUAJIT)/lib else CFLAGS += -I$(ODIR)/include/luajit-2.1 @@ -52,7 +55,7 @@ clean: $(BIN): $(OBJ) @echo LINK $(BIN) - @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(OBJ): config.h Makefile $(DEPS) | $(ODIR) @@ -61,14 +64,14 @@ $(ODIR): $(ODIR)/bytecode.c: src/wrk.lua $(DEPS) @echo LUAJIT $< - @$(SHELL) -c 'PATH="obj/bin:$(PATH)" luajit -b "$(CURDIR)/$<" "$(CURDIR)/$@"' + @$(SHELL) -c 'PATH="obj/bin:$(PATH)" luajit51 -b "$(CURDIR)/$<" "$(CURDIR)/$@"' $(ODIR)/version.o: @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - $(ODIR)/%.o : %.c @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Dependencies