diff options
author | tomas <tomas> | 2005-05-25 12:55:32 +0000 |
---|---|---|
committer | tomas <tomas> | 2005-05-25 12:55:32 +0000 |
commit | 0aa3bf9a0a0a42d14711fef3e95217cc611698e2 (patch) | |
tree | 275fd26bb6bbf7d9c852e17ef2dfa9ac0a75c66c | |
parent | d7c2e9d153972b4dcf1b1f5a630e0ba06899c734 (diff) | |
download | luafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.tar.gz luafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.tar.bz2 luafilesystem-0aa3bf9a0a0a42d14711fef3e95217cc611698e2.zip |
Upgrading for LuaBinaries.
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | config | 8 |
2 files changed, 6 insertions, 10 deletions
@@ -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 | ||
3 | T= lfs | 3 | T= lfs |
4 | 4 | ||
5 | include ./config | 5 | include ./config |
6 | 6 | ||
7 | V= 1.1 | 7 | V= 1.1.0 |
8 | DIST_DIR= luafilesystem-$V | 8 | DIST_DIR= luafilesystem-$V |
9 | TAR_FILE= $(DIST_DIR).tar.gz | 9 | TAR_FILE= $(DIST_DIR).tar.gz |
10 | ZIP_FILE= $(DIST_DIR).zip | 10 | ZIP_FILE= $(DIST_DIR).zip |
11 | LIBNAME= lib$T.$V$(LIB_EXT) | 11 | LIBNAME= lib$T.$V.so |
12 | 12 | ||
13 | COMPAT_O= $(COMPAT_DIR)/compat-5.1.o | 13 | COMPAT_O= $(COMPAT_DIR)/compat-5.1.o |
14 | SRCS= src/$T.c | 14 | SRCS= src/$T.c |
@@ -18,7 +18,7 @@ OBJS= src/$T.o $(COMPAT_O) | |||
18 | lib: src/$(LIBNAME) | 18 | lib: src/$(LIBNAME) |
19 | 19 | ||
20 | src/$(LIBNAME): $(OBJS) | 20 | src/$(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 |
@@ -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) |
3 | LUA_LIBDIR= /usr/local/lib/lua/5.0 | 3 | LUA_LIBDIR= /usr/local/lib/lua/5.0 |
4 | # System's lua directory (where Lua libraries are installed) | ||
5 | LUA_DIR= /usr/local/share/lua/5.0 | ||
6 | # Lua includes directory | 4 | # Lua includes directory |
7 | LUA_INC= /usr/local/include/lua5 | 5 | LUA_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 |
11 | LIB_EXT= .so | ||
12 | #LIB_OPTION= -dynamiclib #for MacOS X | ||
13 | LIB_OPTION= -shared #for Linux | 9 | LIB_OPTION= -shared #for Linux |
14 | 10 | ||
15 | COMPAT_DIR= ../compat/src | 11 | COMPAT_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 |
19 | DLLIB= -ldl | 15 | DLLIB= -ldl |
20 | LUA_LIBS= -llua50 -lm | 16 | #LUA_LIBS= -llua50 -lm |
21 | WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings | 17 | WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings |
22 | INCS= -I$(LUA_INC) -I$(COMPAT_DIR) | 18 | INCS= -I$(LUA_INC) -I$(COMPAT_DIR) |
23 | LIBS= $(LUA_LIBS) $(DLLIB) | 19 | LIBS= $(LUA_LIBS) $(DLLIB) |