|
Line
Link Here
|
| 0 |
-- a/Makefile |
0 |
++ b/Makefile |
|
Lines 12-18
Link Here
|
| 12 |
# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. |
12 |
# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. |
| 13 |
INSTALL_TOP= /usr/local |
13 |
INSTALL_TOP= /usr/local |
| 14 |
INSTALL_BIN= $(INSTALL_TOP)/bin |
14 |
INSTALL_BIN= $(INSTALL_TOP)/bin |
| 15 |
INSTALL_INC= $(INSTALL_TOP)/include |
15 |
INSTALL_INC= $(INSTALL_TOP)/include/lua$V |
| 16 |
INSTALL_LIB= $(INSTALL_TOP)/lib |
16 |
INSTALL_LIB= $(INSTALL_TOP)/lib |
| 17 |
INSTALL_MAN= $(INSTALL_TOP)/man/man1 |
17 |
INSTALL_MAN= $(INSTALL_TOP)/man/man1 |
| 18 |
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V |
18 |
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V |
|
Lines 112-114
Link Here
|
| 112 |
.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho |
112 |
.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho |
| 113 |
|
113 |
|
| 114 |
# (end of Makefile) |
114 |
# (end of Makefile) |
| 115 |
-- a/src/Makefile |
115 |
|
|
|
116 |
# Use libtool for binary installs, etc. |
| 117 |
|
| 118 |
export V |
| 119 |
export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC |
| 120 |
# See libtool manual about how to set this |
| 121 |
|
| 122 |
gentoo_clean: |
| 123 |
cd src; $(MAKE) $@ |
| 124 |
|
| 125 |
gentoo_install: |
| 126 |
mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) |
| 127 |
cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) |
| 128 |
cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) |
| 129 |
cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) |
|
|
130 |
++ b/src/Makefile |
|
Lines 36-45
Link Here
|
| 36 |
lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o |
36 |
lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o |
| 37 |
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) |
37 |
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) |
| 38 |
|
38 |
|
| 39 |
LUA_T= lua |
39 |
LUA_T= lua$V |
| 40 |
LUA_O= lua.o |
40 |
LUA_O= lua.o |
| 41 |
|
41 |
|
| 42 |
LUAC_T= luac |
42 |
LUAC_T= luac$V |
| 43 |
LUAC_O= luac.o |
43 |
LUAC_O= luac.o |
| 44 |
|
44 |
|
| 45 |
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) |
45 |
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) |
|
Lines 59-68
Link Here
|
| 59 |
$(AR) $@ $(BASE_O) |
59 |
$(AR) $@ $(BASE_O) |
| 60 |
$(RANLIB) $@ |
60 |
$(RANLIB) $@ |
| 61 |
|
61 |
|
| 62 |
$(LUA_T): $(LUA_O) $(LUA_A) |
62 |
origin$(LUA_T): $(LUA_O) $(LUA_A) |
| 63 |
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
63 |
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
| 64 |
|
64 |
|
| 65 |
$(LUAC_T): $(LUAC_O) $(LUA_A) |
65 |
origin$(LUAC_T): $(LUAC_O) $(LUA_A) |
| 66 |
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) |
66 |
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) |
| 67 |
|
67 |
|
| 68 |
clean: |
68 |
clean: |
|
Lines 195-197
Link Here
|
| 195 |
lobject.h ltm.h lzio.h |
195 |
lobject.h ltm.h lzio.h |
| 196 |
|
196 |
|
| 197 |
# (end of Makefile) |
197 |
# (end of Makefile) |
|
|
198 |
|
| 199 |
export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC |
| 200 |
export LIB_VERSION = 6:1:1 |
| 201 |
|
| 202 |
# The following rules use libtool for compiling and linking in order to |
| 203 |
# provide shared library support. |
| 204 |
|
| 205 |
LIB_NAME = liblua$V.la |
| 206 |
LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) |
| 207 |
|
| 208 |
%.lo %.o: %.c |
| 209 |
$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< |
| 210 |
|
| 211 |
$(LIB_NAME): $(LIB_OBJS) |
| 212 |
$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ |
| 213 |
-rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 214 |
|
| 215 |
$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) |
| 216 |
$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 217 |
|
| 218 |
$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 219 |
$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 220 |
|
| 221 |
gentoo_clean: |
| 222 |
$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V |
| 223 |
|
| 224 |
gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T) |
