jeremy/callisto
1
Fork 0
Code Releases Activity

makefile: refine

Browse source 
o  remove libcallisto from LIBS
 o  use LIBS rather than liblua.a in csto target
 o  delete csto.o in clean target
 o  remove clean-all from phonies
 o  store the path to the Lua source code in LUADIR rather than using
    the full path everywhere
 o  remove warning flags and preprocessor definitions from cjson's
    compiler command line; it is just not needed.
This commit is contained in:
Jeremy Baxter 2024-02-18 17:23:26 +13:00
parent d4ec5248fe
commit c3a9b5d6d5
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Makefile
View file

@ -2,23 +2,25 @@ include config.mk
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = ${PREFIX}/man MANPREFIX = ${PREFIX}/man
LUADIR = external/lua
CC = ${_CC} CC = ${_CC}
CFLAGS = ${_CFLAGS} -Iexternal/lua -pedantic -Wall -Wextra CFLAGS = ${_CFLAGS} -I${LUADIR} -pedantic -Wall -Wextra
CPPFLAGS = -D_DEFAULT_SOURCE CPPFLAGS = -D_DEFAULT_SOURCE
LDFLAGS = -lm ${_LDFLAGS} LDFLAGS = -lm ${_LDFLAGS}
OBJS = callisto.o lcl.o lenviron.o lextra.o lfs.o ljson.o lprocess.o util.o OBJS = callisto.o lcl.o lenviron.o lextra.o lfs.o ljson.o \
LIBS = libcallisto.a liblua.a lprocess.o util.o
LIBS = liblua.a
CJSON_SRC = external/json CJSON_SRC = external/json
CJSON_OBJS = fpconv.o lua_cjson.o strbuf.o CJSON_OBJS = fpconv.o lua_cjson.o strbuf.o
CJSON_CFLAGS = -Wno-sign-compare -Wno-unused-function CJSON_CFLAGS = ${_CFLAGS} -I${LUADIR}
all: csto libcallisto.a all: csto libcallisto.a
csto: ${LIBS} csto.o csto: ${LIBS} libcallisto.a csto.o
${CC} -o $@ csto.o libcallisto.a liblua.a ${LDFLAGS} ${CC} -o $@ csto.o libcallisto.a ${LIBS} ${LDFLAGS}
libcallisto.a: liblua.a ${CJSON_OBJS} ${OBJS} libcallisto.a: liblua.a ${CJSON_OBJS} ${OBJS}
ar cr $@ ${OBJS} ${CJSON_OBJS} ar cr $@ ${OBJS} ${CJSON_OBJS}
@ -40,18 +42,18 @@ util.o: util.c
# cjson # cjson
fpconv.o: ${CJSON_SRC}/fpconv.c fpconv.o: ${CJSON_SRC}/fpconv.c
${CC} ${CFLAGS} ${CJSON_CFLAGS} ${CPPFLAGS} -c $< ${CC} ${CJSON_CFLAGS} -c $<
lua_cjson.o: ${CJSON_SRC}/lua_cjson.c lua_cjson.o: ${CJSON_SRC}/lua_cjson.c
${CC} ${CFLAGS} ${CJSON_CFLAGS} ${CPPFLAGS} -c $< ${CC} ${CJSON_CFLAGS} -c $<
strbuf.o: ${CJSON_SRC}/strbuf.c strbuf.o: ${CJSON_SRC}/strbuf.c
${CC} ${CFLAGS} ${CJSON_CFLAGS} ${CPPFLAGS} -c $< ${CC} ${CJSON_CFLAGS} -c $<
liblua.a: external/lua/*.c liblua.a: external/lua/*.c
${MAKE} -Cexternal/lua ${MAKE} -Cexternal/lua
mv -f external/lua/liblua.a . mv -f external/lua/liblua.a .
clean: clean:
rm -f csto libcallisto.a ${OBJS} ${CJSON_OBJS} ${LIBS} rm -f csto libcallisto.a csto.o ${OBJS} ${CJSON_OBJS} ${LIBS}
rm -fr include doc/*.html doc/modules rm -fr include doc/*.html doc/modules
${MAKE} -s -Cexternal/lua clean ${MAKE} -s -Cexternal/lua clean
@ -67,4 +69,4 @@ install:
cp -fR include/callisto "${DESTDIR}${PREFIX}"/include cp -fR include/callisto "${DESTDIR}${PREFIX}"/include
cp -f libcallisto.a "${DESTDIR}${PREFIX}"/lib cp -f libcallisto.a "${DESTDIR}${PREFIX}"/lib
.PHONY: all clean clean-all doc install .PHONY: all clean doc install