diff options
| author | Diego Nehab <diego.nehab@gmail.com> | 2012-04-16 20:41:48 +0800 |
|---|---|---|
| committer | Diego Nehab <diego.nehab@gmail.com> | 2012-04-16 20:41:48 +0800 |
| commit | b3c4f46179ed5b27ca76a824f8730fa50dbaae0b (patch) | |
| tree | b5056d95f3307c49d942262387bba2ec3c949451 /src/makefile | |
| parent | 4b671f4551e98ac9e1d9a7407d3dffdd7eb1d3dc (diff) | |
| download | luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.tar.gz luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.tar.bz2 luasocket-b3c4f46179ed5b27ca76a824f8730fa50dbaae0b.zip | |
merged lua_typerrror.{c,h} into auxiliar.{c,h}
Diffstat (limited to 'src/makefile')
| -rw-r--r-- | src/makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/makefile b/src/makefile index a38ff98..0665c14 100644 --- a/src/makefile +++ b/src/makefile | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | PLAT?=macosx | 1 | PLAT?=macosx |
| 2 | LUAV?=5.1 | 2 | LUAV?=5.1 |
| 3 | prefix=/usr/local | 3 | prefix=../../../build/lua/$(LUAV) |
| 4 | #prefix=/usr/local | ||
| 4 | #prefix=/opt/local | 5 | #prefix=/opt/local |
| 5 | #prefix=. | 6 | #prefix=. |
| 6 | 7 | ||
| 7 | LUAINC_macosx=/usr/local/include | 8 | LUAINC_macosx=../../../build/lua/$(LUAV)/include |
| 8 | #LUAINC_macosx=/opt/local/include | 9 | #LUAINC_macosx=/opt/local/include |
| 9 | #LUAINC_macosx=../../../../projects/lua_env/luaenv/lua_versions/lua-5.2.0-beta/src | 10 | #LUAINC_macosx=../../../../projects/lua_env/luaenv/lua_versions/lua-5.2.0-beta/src |
| 10 | #LUAINC_macosx=../../../../projects/lua_env/luaenv/lua_versions/lua-5.1.4/src | 11 | #LUAINC_macosx=../../../../projects/lua_env/luaenv/lua_versions/lua-5.1.4/src |
| @@ -131,8 +132,7 @@ SOCKET_OBJS= \ | |||
| 131 | except.$(O) \ | 132 | except.$(O) \ |
| 132 | select.$(O) \ | 133 | select.$(O) \ |
| 133 | tcp.$(O) \ | 134 | tcp.$(O) \ |
| 134 | udp.$(O) \ | 135 | udp.$(O) |
| 135 | lua_typeerror.$(O) | ||
| 136 | 136 | ||
| 137 | #------ | 137 | #------ |
| 138 | # Modules belonging mime-core | 138 | # Modules belonging mime-core |
| @@ -150,8 +150,7 @@ UNIX_OBJS=\ | |||
| 150 | timeout.$(O) \ | 150 | timeout.$(O) \ |
| 151 | io.$(O) \ | 151 | io.$(O) \ |
| 152 | usocket.$(O) \ | 152 | usocket.$(O) \ |
| 153 | unix.$(O) \ | 153 | unix.$(O) |
| 154 | lua_typeerror.$(O) | ||
| 155 | 154 | ||
| 156 | #------ | 155 | #------ |
| 157 | # Modules belonging to serial (device streams) | 156 | # Modules belonging to serial (device streams) |
| @@ -163,8 +162,7 @@ SERIAL_OBJS:=\ | |||
| 163 | timeout.$(O) \ | 162 | timeout.$(O) \ |
| 164 | io.$(O) \ | 163 | io.$(O) \ |
| 165 | usocket.$(O) \ | 164 | usocket.$(O) \ |
| 166 | serial.$(O) \ | 165 | serial.$(O) |
| 167 | lua_typeerror.$(O) | ||
| 168 | 166 | ||
| 169 | #------ | 167 | #------ |
| 170 | # Files to install | 168 | # Files to install |