diff options
author | tomas <tomas> | 2005-01-18 09:36:11 +0000 |
---|---|---|
committer | tomas <tomas> | 2005-01-18 09:36:11 +0000 |
commit | 7a93f7ee03c7cbbda3ea33b0ad9fce6c319b91c8 (patch) | |
tree | b9a637cd0afa72b2fe1a09edeb4efc642e628fab | |
parent | 9dc07b0ada5b91ee2245f211dfe80f1477bd6abd (diff) | |
download | luafilesystem-7a93f7ee03c7cbbda3ea33b0ad9fce6c319b91c8.tar.gz luafilesystem-7a93f7ee03c7cbbda3ea33b0ad9fce6c319b91c8.tar.bz2 luafilesystem-7a93f7ee03c7cbbda3ea33b0ad9fce6c319b91c8.zip |
Uniformizacao de nomes de variaveis entre as bibliotecas do Kepler.
Melhorias para reutilizacao do Makefile.
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | config | 10 |
2 files changed, 10 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile,v 1.9 2004/11/10 14:44:01 tuler Exp $ | 1 | # $Id: Makefile,v 1.10 2005/01/18 09:36:11 tomas Exp $ |
2 | 2 | ||
3 | T= lfs | 3 | T= lfs |
4 | 4 | ||
@@ -23,9 +23,9 @@ compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c | |||
23 | $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c | 23 | $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c |
24 | 24 | ||
25 | install: $(LIBNAME) | 25 | install: $(LIBNAME) |
26 | mkdir -p $(LIB_DIR) | 26 | mkdir -p $(LUA_LIBDIR) |
27 | cp $(LIBNAME) $(LIB_DIR) | 27 | cp $(LIBNAME) $(LUA_LIBDIR) |
28 | ln -f -s $(LIB_DIR)/$(LIBNAME) $(LIB_DIR)/$T$(LIB_EXT) | 28 | ln -f -s $(LUA_LIBDIR)/$(LIBNAME) $(LUA_LIBDIR)/$T$(LIB_EXT) |
29 | 29 | ||
30 | clean: | 30 | clean: |
31 | rm -f $L $(LIBNAME) $(OBJS) | 31 | rm -f $L $(LIBNAME) $(OBJS) |
@@ -1,8 +1,10 @@ | |||
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 | LIB_DIR= /usr/local/lib | 3 | LUA_LIBDIR= /usr/local/lib/lua/5.0 |
4 | # System's lua directory (where Lua libraries are installed) | 4 | # System's lua directory (where Lua libraries are installed) |
5 | LUA_DIR= /usr/local/lua | 5 | LUA_DIR= /usr/local/share/lua/5.0 |
6 | # Lua includes directory | ||
7 | LUA_INC= /usr/local/include/lua5 | ||
6 | 8 | ||
7 | # OS dependent | 9 | # OS dependent |
8 | LIB_EXT= .dylib | 10 | LIB_EXT= .dylib |
@@ -16,8 +18,8 @@ COMPAT_DIR= . | |||
16 | # On FreeBSD systems, the following line should be commented | 18 | # On FreeBSD systems, the following line should be commented |
17 | DLLIB= -ldl | 19 | DLLIB= -ldl |
18 | WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings | 20 | WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings |
19 | INCS= -I/usr/local/include/lua5 -I$(COMPAT_DIR) | 21 | INCS= -I$(LUA_INC) -I$(COMPAT_DIR) |
20 | LIBS= -L$(LIB_DIR) -llua -llualib -lm $(DLLIB) | 22 | LIBS= -L$(LUA_LIBDIR) -llua -llualib -lm $(DLLIB) |
21 | CFLAGS= $(WARN) $(INCS) | 23 | CFLAGS= $(WARN) $(INCS) |
22 | CC= gcc | 24 | CC= gcc |
23 | 25 | ||