diff options
author | Diego Nehab <diego@impa.br> | 2013-05-30 16:20:34 +0800 |
---|---|---|
committer | Diego Nehab <diego@impa.br> | 2013-05-30 16:20:34 +0800 |
commit | a233e27865d96566a6cb13960d08605ce34d9f0d (patch) | |
tree | 6ef3219bec0c29bbb14ce92b5c2f4dc46b42dbc6 /src/makefile | |
parent | 5341131cd07bf4f66ce242980b5f3cfbbf45ea12 (diff) | |
download | luasocket-a233e27865d96566a6cb13960d08605ce34d9f0d.tar.gz luasocket-a233e27865d96566a6cb13960d08605ce34d9f0d.tar.bz2 luasocket-a233e27865d96566a6cb13960d08605ce34d9f0d.zip |
Leaving if in src/ but out of build for now.
Diffstat (limited to 'src/makefile')
-rw-r--r-- | src/makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/makefile b/src/makefile index 42589f6..f7b0401 100644 --- a/src/makefile +++ b/src/makefile | |||
@@ -30,7 +30,7 @@ DEBUG?=NODEBUG | |||
30 | COMPAT?=NOCOMPAT | 30 | COMPAT?=NOCOMPAT |
31 | 31 | ||
32 | # where lua headers are found for macosx builds | 32 | # where lua headers are found for macosx builds |
33 | # LUAINC_macosx: | 33 | # LUAINC_macosx: |
34 | # /opt/local/include | 34 | # /opt/local/include |
35 | LUAINC_macosx_base?=/opt/local/include | 35 | LUAINC_macosx_base?=/opt/local/include |
36 | LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) | 36 | LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) |
@@ -41,9 +41,9 @@ CDIR_macosx?=lib/lua/$(LUAV) | |||
41 | LDIR_macosx?=share/lua/$(LUAV) | 41 | LDIR_macosx?=share/lua/$(LUAV) |
42 | 42 | ||
43 | 43 | ||
44 | # LUAINC_linux: | 44 | # LUAINC_linux: |
45 | # /usr/include/lua$(LUAV) | 45 | # /usr/include/lua$(LUAV) |
46 | # /usr/local/include | 46 | # /usr/local/include |
47 | # /usr/local/include/lua$(LUAV) | 47 | # /usr/local/include/lua$(LUAV) |
48 | # where lua headers are found for linux builds | 48 | # where lua headers are found for linux builds |
49 | LUAINC_linux_base?=/usr/include | 49 | LUAINC_linux_base?=/usr/include |
@@ -134,7 +134,7 @@ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN -DLUA_$(COMPAT)_MODULE \ | |||
134 | -DMIME_API='__attribute__((visibility("default")))' | 134 | -DMIME_API='__attribute__((visibility("default")))' |
135 | CFLAGS_macosx= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \ | 135 | CFLAGS_macosx= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \ |
136 | -fvisibility=hidden | 136 | -fvisibility=hidden |
137 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o | 137 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o |
138 | LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc | 138 | LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc |
139 | SOCKET_macosx=usocket.o | 139 | SOCKET_macosx=usocket.o |
140 | 140 | ||
@@ -308,15 +308,15 @@ none: | |||
308 | all: $(SOCKET_SO) $(MIME_SO) | 308 | all: $(SOCKET_SO) $(MIME_SO) |
309 | 309 | ||
310 | $(SOCKET_SO): $(SOCKET_OBJS) | 310 | $(SOCKET_SO): $(SOCKET_OBJS) |
311 | $(LD) $(SOCKET_OBJS) $(LDFLAGS)$@ | 311 | $(LD) $(SOCKET_OBJS) $(LDFLAGS)$@ |
312 | 312 | ||
313 | $(MIME_SO): $(MIME_OBJS) | 313 | $(MIME_SO): $(MIME_OBJS) |
314 | $(LD) $(MIME_OBJS) $(LDFLAGS)$@ | 314 | $(LD) $(MIME_OBJS) $(LDFLAGS)$@ |
315 | 315 | ||
316 | all-unix: all $(UNIX_SO) $(SERIAL_SO) | 316 | all-unix: all $(UNIX_SO) $(SERIAL_SO) |
317 | 317 | ||
318 | $(UNIX_SO): $(UNIX_OBJS) | 318 | $(UNIX_SO): $(UNIX_OBJS) |
319 | $(LD) $(UNIX_OBJS) $(LDFLAGS)$@ | 319 | $(LD) $(UNIX_OBJS) $(LDFLAGS)$@ |
320 | 320 | ||
321 | $(SERIAL_SO): $(SERIAL_OBJS) | 321 | $(SERIAL_SO): $(SERIAL_OBJS) |
322 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ | 322 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ |