equal
deleted
inserted
replaced
74 + cd test && $(INSTALL_DATA) $(TO_TEST) $(INSTALL_TEST) |
74 + cd test && $(INSTALL_DATA) $(TO_TEST) $(INSTALL_TEST) |
75 ranlib: |
75 ranlib: |
76 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) |
76 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) |
77 |
77 |
78 --- lua-5.1.4/src/Makefile.orig Sat Jan 19 11:37:58 2008 |
78 --- lua-5.1.4/src/Makefile.orig Sat Jan 19 11:37:58 2008 |
79 +++ lua-5.1.4/src/Makefile Wed Feb 16 15:43:24 2011 |
79 +++ lua-5.1.4/src/Makefile Wed Apr 29 13:50:51 2015 |
80 @@ -4,25 +4,24 @@ |
80 @@ -4,25 +4,23 @@ |
81 |
81 |
82 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= |
82 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= |
83 |
83 |
84 -# Your platform. See PLATS for possible values. |
84 -# Your platform. See PLATS for possible values. |
85 -PLAT= none |
85 -PLAT= none |
86 - |
86 - |
87 -CC= gcc |
87 -CC= gcc |
88 -CFLAGS= -O2 -Wall $(MYCFLAGS) |
88 -CFLAGS= -O2 -Wall $(MYCFLAGS) |
89 +CC=$(CC) |
89 +CC=$(CC) |
90 +CFLAGS= -xO3 -Xc -Kpic $(MYCFLAGS) |
90 +CFLAGS= $(MYCFLAGS) $(USRCFLAGS) |
91 +FLAG_SPARC:sh= if [ ${MACH64} = "sparcv9" ]; then echo -xcode=pic13; fi |
91 +studio_XBITS.sparc.64 += -xcode=pic13 |
92 +CFLAGS= $(FLAG_SPARC) |
|
93 AR= ar rcu |
92 AR= ar rcu |
94 RANLIB= ranlib |
93 RANLIB= ranlib |
95 RM= rm -f |
94 RM= rm -f |
96 -LIBS= -lm $(MYLIBS) |
95 -LIBS= -lm $(MYLIBS) |
97 +LIBS= -lm -lc $(MYLIBS) |
96 +LIBS= -lm -lc $(MYLIBS) |
109 -LUA_A= liblua.a |
108 -LUA_A= liblua.a |
110 +LUA_SO= liblua.so |
109 +LUA_SO= liblua.so |
111 CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ |
110 CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ |
112 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ |
111 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ |
113 lundump.o lvm.o lzio.o |
112 lundump.o lvm.o lzio.o |
114 @@ -36,10 +35,10 @@ |
113 @@ -36,10 +34,10 @@ |
115 LUAC_O= luac.o print.o |
114 LUAC_O= luac.o print.o |
116 |
115 |
117 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) |
116 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) |
118 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) |
117 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) |
119 -ALL_A= $(LUA_A) |
118 -ALL_A= $(LUA_A) |
123 -default: $(PLAT) |
122 -default: $(PLAT) |
124 +default: solaris |
123 +default: solaris |
125 |
124 |
126 all: $(ALL_T) |
125 all: $(ALL_T) |
127 |
126 |
128 @@ -47,15 +46,15 @@ |
127 @@ -47,15 +45,15 @@ |
129 |
128 |
130 a: $(ALL_A) |
129 a: $(ALL_A) |
131 |
130 |
132 -$(LUA_A): $(CORE_O) $(LIB_O) |
131 -$(LUA_A): $(CORE_O) $(LIB_O) |
133 - $(AR) $@ $? |
132 - $(AR) $@ $? |
146 +$(LUAC_T): $(LUAC_O) $(LUA_SO) |
145 +$(LUAC_T): $(LUAC_O) $(LUA_SO) |
147 + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_SO) $(LIBS) |
146 + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_SO) $(LIBS) |
148 |
147 |
149 clean: |
148 clean: |
150 $(RM) $(ALL_T) $(ALL_O) |
149 $(RM) $(ALL_T) $(ALL_O) |
151 @@ -74,46 +73,8 @@ |
150 @@ -74,46 +72,8 @@ |
152 @echo "MYLDFLAGS = $(MYLDFLAGS)" |
151 @echo "MYLDFLAGS = $(MYLDFLAGS)" |
153 @echo "MYLIBS = $(MYLIBS)" |
152 @echo "MYLIBS = $(MYLIBS)" |
154 |
153 |
155 -# convenience targets for popular platforms |
154 -# convenience targets for popular platforms |
156 - |
155 - |
190 -posix: |
189 -posix: |
191 - $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX |
190 - $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX |
192 - |
191 - |
193 solaris: |
192 solaris: |
194 - $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" |
193 - $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" |
195 + $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl" |
194 + $(MAKE) all USRCFLAGS="$(USRCFLAGS)" MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl" |
196 |
195 |
197 # list targets that do not create files (but not all makes understand .PHONY) |
196 # list targets that do not create files (but not all makes understand .PHONY) |
198 .PHONY: all $(PLATS) default o a clean depend echo none |
197 .PHONY: all $(PLATS) default o a clean depend echo none |
199 |
|