Attachment #303829 for bug #406403




++ Makefile

VERSION=0.2.0
LUADIR=/usr/include/luajit-2.0
LUAJIT_VERSION=v2.0.0-beta9-15-g10ef109
YAJLDIR=/usr/include/yajl
YAJL_VERSION=2.0.4-1-g8b48967
UVDIR=deps/uv
UV_VERSION=gfbc2154

PREFIX?=/usr/local
BINDIR?=${DESTDIR}${PREFIX}/bin
INCDIR?=${DESTDIR}${PREFIX}/include/luvit
LIBDIR?=${DESTDIR}${PREFIX}/@LIBDIR@/luvit

OS_NAME=$(shell uname -s)
MH_NAME=$(shell uname -m)
ifeq (${OS_NAME},Darwin)
ifeq (${MH_NAME},x86_64)
LDFLAGS+=-framework CoreServices -pagezero_size 10000 -image_base 100000000
else
LDFLAGS+=-framework CoreServices
endif
else ifeq (${OS_NAME},Linux)
LDFLAGS+=-Wl,-E
endif
# LUAJIT CONFIGURATION #
#XCFLAGS=-g

MAKEFLAGS+=-e

LDFLAGS+=-L${BUILDDIR} -lluvit
LDFLAGS+=/usr/@LIBDIR@/libluajit-5.1.a
LDFLAGS+=${UVDIR}/uv.a
LDFLAGS+=/usr/@LIBDIR@/libyajl_s.a
LDFLAGS+=-Wall -lm -ldl -lpthread

ifeq (${OS_NAME},Linux)

        ${BUILDDIR}/los.o            \
        ${BUILDDIR}/lhttp_parser.o

DEPS=/usr/@LIBDIR@/libyajl_s.a \
	/usr/@LIBDIR@/libluajit-5.1.a \
	${UVDIR}/uv.a \
	${HTTPDIR}/http_parser.o

all: ${BUILDDIR}/luvit

${LUADIR}/Makefile:
	git submodule update --init ${LUADIR}

${LUADIR}/src/libluajit.a: ${LUADIR}/Makefile
	touch -c ${LUADIR}/src/*.h
	$(MAKE) -C ${LUADIR}

${YAJLDIR}/CMakeLists.txt:
	git submodule update --init ${YAJLDIR}

${YAJLDIR}/Makefile: deps/Makefile.yajl ${YAJLDIR}/CMakeLists.txt
	cp deps/Makefile.yajl ${YAJLDIR}/Makefile

${YAJLDIR}/yajl.a: ${YAJLDIR}/Makefile
	rm -rf ${YAJLDIR}/src/yajl
	cp -r ${YAJLDIR}/src/api ${YAJLDIR}/src/yajl
	$(MAKE) -C ${YAJLDIR}

${UVDIR}/Makefile:
	git submodule update --init ${UVDIR}



${BUILDDIR}/%.o: src/%.c ${DEPS}
	mkdir -p ${BUILDDIR}
	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"

${BUILDDIR}/libluvit.a: ${LUVLIBS} ${DEPS}
	$(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}

${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o
	$(CC) $(CFLAGS) -g -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a ${LDFLAGS}

clean:
	${MAKE} -C ${LUADIR} clean
	${MAKE} -C ${HTTPDIR} clean
	${MAKE} -C ${YAJLDIR} clean
	${MAKE} -C ${UVDIR} distclean
	${MAKE} -C examples/native clean
	rm -rf build bundle

	chmod +x ${BINDIR}/luvit-config
	mkdir -p ${LIBDIR}
	cp lib/luvit/*.lua ${LIBDIR}
	mkdir -p ${INCDIR}/luajit
	cp ${LUADIR}/src/lua.h ${INCDIR}/luajit/
	cp ${LUADIR}/src/lauxlib.h ${INCDIR}/luajit/
	cp ${LUADIR}/src/luaconf.h ${INCDIR}/luajit/
	cp ${LUADIR}/src/luajit.h ${INCDIR}/luajit/
	cp ${LUADIR}/src/lualib.h ${INCDIR}/luajit/
	mkdir -p ${INCDIR}/http_parser
	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
	mkdir -p ${INCDIR}/uv


bundle: build/luvit ${BUILDDIR}/libluvit.a
	build/luvit tools/bundler.lua
	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_exports.c -o bundle/luvit_exports.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_main.c -o bundle/luvit_main.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
	$(CC) $(CFLAGS) -g -o bundle/luvit ${BUILDDIR}/libluvit.a `ls bundle/*.o` ${LDFLAGS}

test: ${BUILDDIR}/luvit
	cd tests && ../${BUILDDIR}/luvit runner.lua

Return to bug 406403

Line Link Here

(-)file_not_specified_in_diff (-44 / +18 lines)
0	-- Makefile	0	++ Makefile
Lines 1-7 Link Here
1	VERSION=0.2.0	1	VERSION=0.2.0
2	LUADIR=deps/luajit	2	LUADIR=/usr/include/luajit-2.0
3	LUAJIT_VERSION=v2.0.0-beta9-15-g10ef109	3	LUAJIT_VERSION=v2.0.0-beta9-15-g10ef109
4	YAJLDIR=deps/yajl	4	YAJLDIR=/usr/include/yajl
5	YAJL_VERSION=2.0.4-1-g8b48967	5	YAJL_VERSION=2.0.4-1-g8b48967
6	UVDIR=deps/uv	6	UVDIR=deps/uv
7	UV_VERSION=gfbc2154	7	UV_VERSION=gfbc2154
Lines 12-29 Link Here
12	PREFIX?=/usr/local	12	PREFIX?=/usr/local
13	BINDIR?=${DESTDIR}${PREFIX}/bin	13	BINDIR?=${DESTDIR}${PREFIX}/bin
14	INCDIR?=${DESTDIR}${PREFIX}/include/luvit	14	INCDIR?=${DESTDIR}${PREFIX}/include/luvit
15	LIBDIR?=${DESTDIR}${PREFIX}/lib/luvit	15	LIBDIR?=${DESTDIR}${PREFIX}/@LIBDIR@/luvit
16		16
17	OS_NAME=$(shell uname -s)	17	OS_NAME=$(shell uname -s)
18	MH_NAME=$(shell uname -m)	18	MH_NAME=$(shell uname -m)
19	ifeq (${OS_NAME},Darwin)	19	ifeq (${OS_NAME},Darwin)
20	ifeq (${MH_NAME},x86_64)	20	ifeq (${MH_NAME},x86_64)
21	LDFLAGS=-framework CoreServices -pagezero_size 10000 -image_base 100000000	21	LDFLAGS+=-framework CoreServices -pagezero_size 10000 -image_base 100000000
22	else	22	else
23	LDFLAGS=-framework CoreServices	23	LDFLAGS+=-framework CoreServices
24	endif	24	endif
25	else ifeq (${OS_NAME},Linux)	25	else ifeq (${OS_NAME},Linux)
26	LDFLAGS=-Wl,-E	26	LDFLAGS+=-Wl,-E
27	endif	27	endif
28	# LUAJIT CONFIGURATION #	28	# LUAJIT CONFIGURATION #
29	#XCFLAGS=-g	29	#XCFLAGS=-g
Lines 36-44 Link Here
36	MAKEFLAGS+=-e	36	MAKEFLAGS+=-e
37		37
38	LDFLAGS+=-L${BUILDDIR} -lluvit	38	LDFLAGS+=-L${BUILDDIR} -lluvit
39	LDFLAGS+=${LUADIR}/src/libluajit.a	39	LDFLAGS+=/usr/@LIBDIR@/libluajit-5.1.a
40	LDFLAGS+=${UVDIR}/uv.a	40	LDFLAGS+=${UVDIR}/uv.a
41	LDFLAGS+=${YAJLDIR}/yajl.a	41	LDFLAGS+=/usr/@LIBDIR@/libyajl_s.a
42	LDFLAGS+=-Wall -lm -ldl -lpthread	42	LDFLAGS+=-Wall -lm -ldl -lpthread
43		43
44	ifeq (${OS_NAME},Linux)	44	ifeq (${OS_NAME},Linux)
Lines 67-97 Link Here
67	${BUILDDIR}/los.o \	67	${BUILDDIR}/los.o \
68	${BUILDDIR}/lhttp_parser.o	68	${BUILDDIR}/lhttp_parser.o
69		69
70	DEPS=${LUADIR}/src/libluajit.a \	70	DEPS=/usr/@LIBDIR@/libyajl_s.a \
71	${YAJLDIR}/yajl.a \	71	/usr/@LIBDIR@/libluajit-5.1.a \
72	${UVDIR}/uv.a \	72	${UVDIR}/uv.a \
73	${HTTPDIR}/http_parser.o	73	${HTTPDIR}/http_parser.o
74		74
75	all: ${BUILDDIR}/luvit	75	all: ${BUILDDIR}/luvit
76		76
77	${LUADIR}/Makefile:
78	git submodule update --init ${LUADIR}
79
80	${LUADIR}/src/libluajit.a: ${LUADIR}/Makefile
81	touch -c ${LUADIR}/src/*.h
82	$(MAKE) -C ${LUADIR}
83
84	${YAJLDIR}/CMakeLists.txt:
85	git submodule update --init ${YAJLDIR}
86
87	${YAJLDIR}/Makefile: deps/Makefile.yajl ${YAJLDIR}/CMakeLists.txt
88	cp deps/Makefile.yajl ${YAJLDIR}/Makefile
89
90	${YAJLDIR}/yajl.a: ${YAJLDIR}/Makefile
91	rm -rf ${YAJLDIR}/src/yajl
92	cp -r ${YAJLDIR}/src/api ${YAJLDIR}/src/yajl
93	$(MAKE) -C ${YAJLDIR}
94
95	${UVDIR}/Makefile:	77	${UVDIR}/Makefile:
96	git submodule update --init ${UVDIR}	78	git submodule update --init ${UVDIR}
97		79
Lines 106-123 Link Here
106		88
107	${BUILDDIR}/%.o: src/%.c ${DEPS}	89	${BUILDDIR}/%.o: src/%.c ${DEPS}
108	mkdir -p ${BUILDDIR}	90	mkdir -p ${BUILDDIR}
109	$(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"	91	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
110		92
111	${BUILDDIR}/libluvit.a: ${LUVLIBS} ${DEPS}	93	${BUILDDIR}/libluvit.a: ${LUVLIBS} ${DEPS}
112	$(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}	94	$(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}
113		95
114	${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o	96	${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o
115	$(CC) -g -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a ${LDFLAGS}	97	$(CC) $(CFLAGS) -g -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a ${LDFLAGS}
116		98
117	clean:	99	clean:
118	${MAKE} -C ${LUADIR} clean
119	${MAKE} -C ${HTTPDIR} clean	100	${MAKE} -C ${HTTPDIR} clean
120	${MAKE} -C ${YAJLDIR} clean
121	${MAKE} -C ${UVDIR} distclean	101	${MAKE} -C ${UVDIR} distclean
122	${MAKE} -C examples/native clean	102	${MAKE} -C examples/native clean
123	rm -rf build bundle	103	rm -rf build bundle
Lines 129-140 Link Here
129	chmod +x ${BINDIR}/luvit-config	109	chmod +x ${BINDIR}/luvit-config
130	mkdir -p ${LIBDIR}	110	mkdir -p ${LIBDIR}
131	cp lib/luvit/*.lua ${LIBDIR}	111	cp lib/luvit/*.lua ${LIBDIR}
132	mkdir -p ${INCDIR}/luajit
133	cp ${LUADIR}/src/lua.h ${INCDIR}/luajit/
134	cp ${LUADIR}/src/lauxlib.h ${INCDIR}/luajit/
135	cp ${LUADIR}/src/luaconf.h ${INCDIR}/luajit/
136	cp ${LUADIR}/src/luajit.h ${INCDIR}/luajit/
137	cp ${LUADIR}/src/lualib.h ${INCDIR}/luajit/
138	mkdir -p ${INCDIR}/http_parser	112	mkdir -p ${INCDIR}/http_parser
139	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/	113	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
140	mkdir -p ${INCDIR}/uv	114	mkdir -p ${INCDIR}/uv
Lines 144-152 Link Here
144		118
145	bundle: build/luvit ${BUILDDIR}/libluvit.a	119	bundle: build/luvit ${BUILDDIR}/libluvit.a
146	build/luvit tools/bundler.lua	120	build/luvit tools/bundler.lua
147	$(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_exports.c -o bundle/luvit_exports.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"	121	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_exports.c -o bundle/luvit_exports.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
148	$(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_main.c -o bundle/luvit_main.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"	122	$(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_main.c -o bundle/luvit_main.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR} -I${YAJLDIR} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
149	$(CC) -g -o bundle/luvit ${BUILDDIR}/libluvit.a `ls bundle/*.o` ${LDFLAGS}	123	$(CC) $(CFLAGS) -g -o bundle/luvit ${BUILDDIR}/libluvit.a `ls bundle/*.o` ${LDFLAGS}
150		124
151	test: ${BUILDDIR}/luvit	125	test: ${BUILDDIR}/luvit
152	cd tests && ../${BUILDDIR}/luvit runner.lua	126	cd tests && ../${BUILDDIR}/luvit runner.lua