qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid building unneeded libs. 

Having better dependency info in build_control.m4 would be nice, but this
works well enough for now.
This commit is contained in:
Bill Currie 2012-08-20 14:12:20 +09:00
parent 365f20bb95
commit abc81cee85
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.d/build_control.m4
View File

@ -53,6 +53,7 @@ if test "x$HAVE_FBDEV" = xyes; then
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client]) QF_NEED(console, [client])
QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
fi fi
fi fi
if test "x$HAVE_X" = xyes; then if test "x$HAVE_X" = xyes; then
@ -83,6 +84,7 @@ if test "x$HAVE_X" = xyes; then
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client]) QF_NEED(console, [client])
QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
fi fi
fi fi
if test "x$HAVE_SDL" = xyes; then if test "x$HAVE_SDL" = xyes; then
@ -106,6 +108,7 @@ if test "x$HAVE_SDL" = xyes; then
QF_NEED(qw, [client common sdl]) QF_NEED(qw, [client common sdl])
QF_NEED(nq, [client common sdl]) QF_NEED(nq, [client common sdl])
QF_NEED(console, [client]) QF_NEED(console, [client])
QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
fi fi
fi fi
if test "x$HAVE_SVGA" = xyes; then if test "x$HAVE_SVGA" = xyes; then
@ -127,6 +130,7 @@ if test "x$HAVE_SVGA" = xyes; then
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client]) QF_NEED(console, [client])
QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
fi fi
fi fi
#if test "x$mingw" = xyes; then #if test "x$mingw" = xyes; then
@ -145,6 +149,7 @@ fi
# QF_NEED(qw, [client common]) # QF_NEED(qw, [client common])
# QF_NEED(nq, [client common]) # QF_NEED(nq, [client common])
# QF_NEED(console, [client]) # QF_NEED(console, [client])
# QF_NEED(libs,[util gamecode ruamoko gib audio image models video console net qw client])
# fi # fi
#fi #fi
@ -179,42 +184,55 @@ fi
if test "x$ENABLE_tools_bsp2img" = xyes; then if test "x$ENABLE_tools_bsp2img" = xyes; then
QF_NEED(tools,[bsp2img]) QF_NEED(tools,[bsp2img])
QF_NEED(libs,[image util])
fi fi
if test "x$ENABLE_tools_carne" = xyes; then if test "x$ENABLE_tools_carne" = xyes; then
QF_NEED(tools,[carne]) QF_NEED(tools,[carne])
QF_NEED(libs,[gib ruamoko gamecode util])
fi fi
if test "x$ENABLE_tools_pak" = xyes; then if test "x$ENABLE_tools_pak" = xyes; then
QF_NEED(tools,[pak]) QF_NEED(tools,[pak])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qfbsp" = xyes; then if test "x$ENABLE_tools_qfbsp" = xyes; then
QF_NEED(tools,[qfbsp]) QF_NEED(tools,[qfbsp])
QF_NEED(libs,[models image util])
fi fi
if test "x$ENABLE_tools_qfcc" = xyes; then if test "x$ENABLE_tools_qfcc" = xyes; then
QF_NEED(tools,[qfcc]) QF_NEED(tools,[qfcc])
QF_NEED(libs,[gamecode util])
fi fi
if test "x$ENABLE_tools_qflight" = xyes; then if test "x$ENABLE_tools_qflight" = xyes; then
QF_NEED(tools,[qflight]) QF_NEED(tools,[qflight])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qflmp" = xyes; then if test "x$ENABLE_tools_qflmp" = xyes; then
QF_NEED(tools,[qflmp]) QF_NEED(tools,[qflmp])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qfmodelgen" = xyes; then if test "x$ENABLE_tools_qfmodelgen" = xyes; then
QF_NEED(tools,[qfmodelgen]) QF_NEED(tools,[qfmodelgen])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qfspritegen" = xyes; then if test "x$ENABLE_tools_qfspritegen" = xyes; then
QF_NEED(tools,[qfspritegen]) QF_NEED(tools,[qfspritegen])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qfvis" = xyes; then if test "x$ENABLE_tools_qfvis" = xyes; then
QF_NEED(tools,[qfvis]) QF_NEED(tools,[qfvis])
QF_NEED(libs,[util])
fi fi
if test "x$ENABLE_tools_qwaq" = xyes; then if test "x$ENABLE_tools_qwaq" = xyes; then
QF_NEED(tools,[qwaq]) QF_NEED(tools,[qwaq])
QF_NEED(libs,[ruamoko gamecode util])
fi fi
if test "x$ENABLE_tools_wad" = xyes; then if test "x$ENABLE_tools_wad" = xyes; then
QF_NEED(tools,[wad]) QF_NEED(tools,[wad])
QF_NEED(libs,[image util])
fi fi
if test "x$ENABLE_tools_wav" = xyes; then if test "x$ENABLE_tools_wav" = xyes; then
QF_NEED(tools,[wav]) QF_NEED(tools,[wav])
QF_NEED(libs,[util])
fi fi
QF_NEED(top, [libs hw nq qtv qw]) QF_NEED(top, [libs hw nq qtv qw])
@ -222,6 +240,8 @@ QF_NEED(top, [libs hw nq qtv qw])
QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav]) QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav])
QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav], QF_NEED(top,tools)) QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav], QF_NEED(top,tools))
QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client])
if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
QF_NEED(top, [ruamoko]) QF_NEED(top, [ruamoko])
fi fi

3
libs/Makefile.am
View File

@ -7,5 +7,6 @@ AUTOMAKE_OPTIONS= foreign
# models depends on image # models depends on image
# video depends on models(?), image(?) and ruamoko # video depends on models(?), image(?) and ruamoko
# console depends on video, ruamoko and audio # console depends on video, ruamoko and audio
SUBDIRS=util gamecode ruamoko gib audio image models video console \ SUBDIRS=@libs_dirs@
DIST_SUBDIRS=util gamecode ruamoko gib audio image models video console \
net qw client net qw client