diff options
Diffstat (limited to 'cgit.mk')
-rw-r--r-- | cgit.mk | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/cgit.mk b/cgit.mk index 3fcc1ca..5b9ed5b 100644 --- a/cgit.mk +++ b/cgit.mk | |||
@@ -27,32 +27,6 @@ ifdef NO_C99_FORMAT | |||
27 | CFLAGS += -DNO_C99_FORMAT | 27 | CFLAGS += -DNO_C99_FORMAT |
28 | endif | 28 | endif |
29 | 29 | ||
30 | ifdef NO_LUA | ||
31 | LUA_MESSAGE := linking without specified Lua support | ||
32 | CGIT_CFLAGS += -DNO_LUA | ||
33 | else | ||
34 | ifeq ($(LUA_PKGCONFIG),) | ||
35 | LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \ | ||
36 | $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \ | ||
37 | done) | ||
38 | LUA_MODE := autodetected | ||
39 | else | ||
40 | LUA_MODE := specified | ||
41 | endif | ||
42 | ifneq ($(LUA_PKGCONFIG),) | ||
43 | LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG) | ||
44 | LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null) | ||
45 | LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null) | ||
46 | CGIT_LIBS += $(LUA_LIBS) | ||
47 | CGIT_CFLAGS += $(LUA_CFLAGS) | ||
48 | else | ||
49 | LUA_MESSAGE := linking without autodetected Lua support | ||
50 | NO_LUA := YesPlease | ||
51 | CGIT_CFLAGS += -DNO_LUA | ||
52 | endif | ||
53 | |||
54 | endif | ||
55 | |||
56 | # Add -ldl to linker flags on systems that commonly use GNU libc. | 30 | # Add -ldl to linker flags on systems that commonly use GNU libc. |
57 | ifneq (,$(filter $(uname_S),Linux GNU GNU/kFreeBSD)) | 31 | ifneq (,$(filter $(uname_S),Linux GNU GNU/kFreeBSD)) |
58 | CGIT_LIBS += -ldl | 32 | CGIT_LIBS += -ldl |
@@ -130,7 +104,6 @@ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs) | |||
130 | $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $< | 104 | $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $< |
131 | 105 | ||
132 | $(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS) | 106 | $(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS) |
133 | @echo 1>&1 " * $(LUA_MESSAGE)" | ||
134 | $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS) | 107 | $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS) |
135 | 108 | ||
136 | CGIT_SP_OBJS := $(patsubst %.o,%.sp,$(CGIT_OBJS)) | 109 | CGIT_SP_OBJS := $(patsubst %.o,%.sp,$(CGIT_OBJS)) |