aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortomas <tomas>2005-05-25 12:55:32 +0000
committertomas <tomas>2005-05-25 12:55:32 +0000
commit0aa3bf9a0a0a42d14711fef3e95217cc611698e2 (patch)
tree275fd26bb6bbf7d9c852e17ef2dfa9ac0a75c66c
parentd7c2e9d153972b4dcf1b1f5a630e0ba06899c734 (diff)
downloadluafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.tar.gz
luafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.tar.bz2
luafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.zip
Upgrading for LuaBinaries.
-rw-r--r--Makefile8
-rw-r--r--config8
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 @@
1# $Id: Makefile,v 1.16 2005/05/20 18:32:51 uid20006 Exp $ 1# $Id: Makefile,v 1.17 2005/05/25 12:55:32 tomas Exp $
2 2
3T= lfs 3T= lfs
4 4
5include ./config 5include ./config
6 6
7V= 1.1 7V= 1.1.0
8DIST_DIR= luafilesystem-$V 8DIST_DIR= luafilesystem-$V
9TAR_FILE= $(DIST_DIR).tar.gz 9TAR_FILE= $(DIST_DIR).tar.gz
10ZIP_FILE= $(DIST_DIR).zip 10ZIP_FILE= $(DIST_DIR).zip
11LIBNAME= lib$T.$V$(LIB_EXT) 11LIBNAME= lib$T.$V.so
12 12
13COMPAT_O= $(COMPAT_DIR)/compat-5.1.o 13COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
14SRCS= src/$T.c 14SRCS= src/$T.c
@@ -18,7 +18,7 @@ OBJS= src/$T.o $(COMPAT_O)
18lib: src/$(LIBNAME) 18lib: src/$(LIBNAME)
19 19
20src/$(LIBNAME): $(OBJS) 20src/$(LIBNAME): $(OBJS)
21 $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(LIBS) 21 $(CC) $(CFLAGS) $(LIBS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
22 22
23$(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c 23$(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
24 $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c 24 $(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 @@
1# Installation directories 1# Installation directories
2# System's libraries directory (where binary libraries are installed) 2# System's libraries directory (where binary libraries are installed)
3LUA_LIBDIR= /usr/local/lib/lua/5.0 3LUA_LIBDIR= /usr/local/lib/lua/5.0
4# System's lua directory (where Lua libraries are installed)
5LUA_DIR= /usr/local/share/lua/5.0
6# Lua includes directory 4# Lua includes directory
7LUA_INC= /usr/local/include/lua5 5LUA_INC= /usr/local/include/lua5
8 6
9# OS dependent 7# OS dependent
10#LIB_EXT= .dylib 8#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
11LIB_EXT= .so
12#LIB_OPTION= -dynamiclib #for MacOS X
13LIB_OPTION= -shared #for Linux 9LIB_OPTION= -shared #for Linux
14 10
15COMPAT_DIR= ../compat/src 11COMPAT_DIR= ../compat/src
@@ -17,7 +13,7 @@ COMPAT_DIR= ../compat/src
17# Compilation directives 13# Compilation directives
18# On FreeBSD systems, the following line should be commented 14# On FreeBSD systems, the following line should be commented
19DLLIB= -ldl 15DLLIB= -ldl
20LUA_LIBS= -llua50 -lm 16#LUA_LIBS= -llua50 -lm
21WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings 17WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
22INCS= -I$(LUA_INC) -I$(COMPAT_DIR) 18INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
23LIBS= $(LUA_LIBS) $(DLLIB) 19LIBS= $(LUA_LIBS) $(DLLIB)