parsing.c: Remove leading space from committer

[cgit.git] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index 8af0041d78c58b1c47079af9432036a4a7cc2ed4..056c3f9d2864c3aee1a656198a63ef053117fbdc 100644 (file)
--- a/cgit.mk
+++ b/cgit.mk
@@ -25,10 +25,55 @@ ifdef NO_C99_FORMAT
        CFLAGS += -DNO_C99_FORMAT
 endif
 
+ifdef NO_LUA
+       LUA_MESSAGE := linking without specified Lua support
+       CGIT_CFLAGS += -DNO_LUA
+else
+LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null)
+LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
+LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
+LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
+ifeq (JIT,$(LUA_IMPLEMENTATION))
+       ifeq ($(strip $(LUAJIT_LIBS)),)
+               $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
+       endif
+       LUA_MESSAGE := linking with selected LuaJIT
+       CGIT_LIBS += $(LUAJIT_LIBS)
+       CGIT_CFLAGS += $(LUAJIT_CFLAGS)
+else ifeq (VANILLA,$(LUA_IMPLEMENTATION))
+       ifeq ($(strip $(LUA_LIBS)),)
+               $(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
+       endif
+       LUA_MESSAGE := linking with selected Lua
+       CGIT_LIBS += $(LUA_LIBS)
+       CGIT_LIBS += $(LUA_CFLAGS)
+else ifneq ($(strip $(LUAJIT_LIBS)),)
+       LUA_MESSAGE := linking with autodetected LuaJIT
+       CGIT_LIBS += $(LUAJIT_LIBS)
+       CGIT_CFLAGS += $(LUAJIT_CFLAGS)
+else ifneq ($(strip $(LUA_LIBS)),)
+       LUA_MESSAGE := linking with autodetected Lua
+       CGIT_LIBS += $(LUA_LIBS)
+       CGIT_CFLAGS += $(LUA_CFLAGS)
+else
+       LUA_MESSAGE := linking without autodetected Lua support
+       NO_LUA := YesPlease
+       CGIT_CFLAGS += -DNO_LUA
+endif
+
+endif
+
+# Add -ldl to linker flags on non-BSD systems.
+ifeq ($(findstring BSD,$(uname_S)),)
+       CGIT_LIBS += -ldl
+endif
+
+
 CGIT_OBJ_NAMES += cgit.o
 CGIT_OBJ_NAMES += cache.o
 CGIT_OBJ_NAMES += cmd.o
 CGIT_OBJ_NAMES += configfile.o
+CGIT_OBJ_NAMES += filter.o
 CGIT_OBJ_NAMES += html.o
 CGIT_OBJ_NAMES += parsing.o
 CGIT_OBJ_NAMES += scan-tree.o
@@ -50,7 +95,6 @@ CGIT_OBJ_NAMES += ui-stats.o
 CGIT_OBJ_NAMES += ui-summary.o
 CGIT_OBJ_NAMES += ui-tag.o
 CGIT_OBJ_NAMES += ui-tree.o
-CGIT_OBJ_NAMES += vector.o
 
 CGIT_OBJS := $(addprefix $(CGIT_PREFIX),$(CGIT_OBJ_NAMES))
 
@@ -61,7 +105,6 @@ $(CGIT_VERSION_OBJS): $(CGIT_PREFIX)VERSION
 $(CGIT_VERSION_OBJS): EXTRA_CPPFLAGS = \
        -DCGIT_VERSION='"$(CGIT_VERSION)"'
 
-
 # Git handles dependencies using ":=" so dependencies in CGIT_OBJ are not
 # handled by that and we must handle them ourselves.
 cgit_dep_files := $(foreach f,$(CGIT_OBJS),$(dir $f).depend/$(notdir $f).d)
@@ -88,4 +131,5 @@ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
        $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
 
 $(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
-       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+       @echo 1>&1 "    * $(LUA_MESSAGE)"
+       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)