From 15e763916815fdf1f76386a8e5090a849d2310a1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 4 Aug 2008 22:46:26 +0000 Subject: [PATCH] * luci/contrib: fix bitlib compilation --- contrib/bitlib/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/bitlib/Makefile b/contrib/bitlib/Makefile index 384414b5d..6b7c82483 100644 --- a/contrib/bitlib/Makefile +++ b/contrib/bitlib/Makefile @@ -17,16 +17,13 @@ $(BITLIB_FILE): $(BITLIB_DIR)/.prepared: $(BITLIB_FILE) rm -rf $(BITLIB_DIR) tar xvfz $(BITLIB_FILE) + test -f $(BITLIB_DIR)/config.h || cp $(BITLIB_DIR)/config.h.in $(BITLIB_DIR)/config.h touch $@ -$(BITLIB_DIR)/.configured: $(BITLIB_DIR)/.prepared - ( cd $(BITLIB_DIR); ./configure ) - touch $@ - -compile: $(BITLIB_DIR)/.configured - $(MAKE) -C $(BITLIB_DIR) CC=$(CC) CFLAGS="$(CFLAGS) $(LUA_CFLAGS)" LDFLAGS="$(LDFLAGS) $(LUA_SHLIBS)" OS="$(OS)" +compile: $(BITLIB_DIR)/.prepared mkdir -p dist$(LUA_LIBRARYDIR) - cp $(BITLIB_DIR)/.libs/bit.so.0.0.0 dist$(LUA_LIBRARYDIR)/bit.so + $(COMPILE) -DHAVE_CONFIG_H -I$(BITLIB_DIR) -O2 -c $(BITLIB_DIR)/lbitlib.c $(FPIC) $(LUA_CFLAGS) -o $(BITLIB_DIR)/lbitlib.o + $(LINK) $(SHLIB_FLAGS) $(LDFLAGS) $(BITLIB_DIR)/lbitlib.o $(LUA_SHLIBS) -lm -ldl -o dist$(LUA_LIBRARYDIR)/bit.so luasource: luastrip: -- 2.11.0