From 0aa3bf9a0a0a42d14711fef3e95217cc611698e2 Mon Sep 17 00:00:00 2001 From: tomas Date: Wed, 25 May 2005 12:55:32 +0000 Subject: Upgrading for LuaBinaries. --- Makefile | 8 ++++---- config | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f9b877c..7b2dcc2 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ -# $Id: Makefile,v 1.16 2005/05/20 18:32:51 uid20006 Exp $ +# $Id: Makefile,v 1.17 2005/05/25 12:55:32 tomas Exp $ T= lfs include ./config -V= 1.1 +V= 1.1.0 DIST_DIR= luafilesystem-$V TAR_FILE= $(DIST_DIR).tar.gz ZIP_FILE= $(DIST_DIR).zip -LIBNAME= lib$T.$V$(LIB_EXT) +LIBNAME= lib$T.$V.so COMPAT_O= $(COMPAT_DIR)/compat-5.1.o SRCS= src/$T.c @@ -18,7 +18,7 @@ OBJS= src/$T.o $(COMPAT_O) lib: src/$(LIBNAME) src/$(LIBNAME): $(OBJS) - $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LIBS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c diff --git a/config b/config index 585de14..87e22aa 100644 --- a/config +++ b/config @@ -1,15 +1,11 @@ # Installation directories # System's libraries directory (where binary libraries are installed) LUA_LIBDIR= /usr/local/lib/lua/5.0 -# System's lua directory (where Lua libraries are installed) -LUA_DIR= /usr/local/share/lua/5.0 # Lua includes directory LUA_INC= /usr/local/include/lua5 # OS dependent -#LIB_EXT= .dylib -LIB_EXT= .so -#LIB_OPTION= -dynamiclib #for MacOS X +#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X LIB_OPTION= -shared #for Linux COMPAT_DIR= ../compat/src @@ -17,7 +13,7 @@ COMPAT_DIR= ../compat/src # Compilation directives # On FreeBSD systems, the following line should be commented DLLIB= -ldl -LUA_LIBS= -llua50 -lm +#LUA_LIBS= -llua50 -lm WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings INCS= -I$(LUA_INC) -I$(COMPAT_DIR) LIBS= $(LUA_LIBS) $(DLLIB) -- cgit v1.2.3-55-g6feb