From d820a6eceebccc7291e4c7fd7af3a5045e068eb7 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 17 May 2001 16:52:47 +0000 Subject: [PATCH] fix up the libs dependencies so the targets get relinked if any of the QF libs get updated (vital for static builds) --- nq/source/Makefile.am | 34 ++++++++++++++++---------------- qw/source/Makefile.am | 45 ++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index a24d84767..613a75f2e 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -62,14 +62,14 @@ libqfnet_a_SOURCES= net_bsd.c net_dgrm.c net_loop.c \ EXTRA_libqfnet_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \ net_win.c net_wins.c net_wipx.c -client_LIBS= -L. -lqfnet \ - $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/audio/cd/libQFcd.la \ - $(top_builddir)/libs/audio/targets/libQFsound.la \ - $(top_builddir)/libs/util/libQFutil.la \ - $(SOUND_LIBS) $(NET_LIBS) -client_LIB_DEPS= libqfnet.a +qf_client_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la \ + $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/audio/cd/libQFcd.la \ + $(top_builddir)/libs/audio/targets/libQFsound.la \ + $(top_builddir)/libs/util/libQFutil.la + +client_LIBS= -L. -lqfnet $(qf_client_LIBS) $(SOUND_LIBS) $(NET_LIBS) +client_LIB_DEPS= libqfnet.a $(qf_client_LIBS) client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \ cl_tent.c console.c keys.c sbar.c r_cvar.c r_efrag.c r_part.c r_view.c \ @@ -96,27 +96,27 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c \ # ... Linux FBDev nq_fbdev_SOURCES= $(combined_SOURCES) $(soft_SOURCES) nq_fbdev_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIBS) -nq_fbdev_DEPENDENCIES= $(client_LIB_DEPS) +nq_fbdev_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIB_DEPS) # ... SciTech MGL nq_mgl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) nq_mgl_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIBS) $(MGL_LIBS) -nq_mgl_DEPENDENCIES=$(client_LIB_DEPS) +nq_mgl_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIB_DEPS) # ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher nq_sdl_SOURCES= $(combined_SOURCES) $(soft_SOURCES) nq_sdl_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIBS) $(SDL_LIBS) -nq_sdl_DEPENDENCIES=$(client_LIB_DEPS) +nq_sdl_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIB_DEPS) # ... Linux SVGAlib nq_svga_SOURCES= $(combined_SOURCES) $(soft_SOURCES) nq_svga_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIBS) $(SVGA_LIBS) -nq_svga_DEPENDENCIES=$(client_LIB_DEPS) +nq_svga_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIB_DEPS) # ... X11 nq_x11_SOURCES= $(combined_SOURCES) $(soft_SOURCES) nq_x11_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) -nq_x11_DEPENDENCIES=$(client_LIB_DEPS) +nq_x11_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_LIB_DEPS) # OpenGL-using targets @@ -129,23 +129,23 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \ # ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL nq_3dfx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) nq_3dfx_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS) -nq_3dfx_DEPENDENCIES=$(client_LIB_DEPS) +nq_3dfx_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIB_DEPS) # ... OpenGL in X Window nq_glx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) nq_glx_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS) -nq_glx_DEPENDENCIES= $(client_LIB_DEPS) +nq_glx_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIB_DEPS) # ... Simple Directmedia Layer, version 1.1 and higher, in GL mode nq_sgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) nq_sgl_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS) -nq_sgl_DEPENDENCIES= $(client_LIB_DEPS) +nq_sgl_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIB_DEPS) # ... SGI/Microsoft WGL (Windows OpenGL) nq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) conproc.c nq_wgl_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIBS) $(GLX_LIBS) -lgdi32 -lcomctl32 -lwinmm -nq_wgl_DEPENDENCIES= $(client_LIB_DEPS) +nq_wgl_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIB_DEPS) # Dedicated Server ded_SOURCES= sys_unixd.c sv_ded.c diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 6428fd638..db3eec3da 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -68,12 +68,13 @@ server_SOURCES= sv_ccmds.c sv_cvar.c \ sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \ sv_user.c world.c worlda.S $(syssv_SRC) +qf_server_LIBS= $(top_builddir)/libs/models/libQFmodels.la \ + $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/util/libQFutil.la + qw_server_SOURCES= $(common_SOURCES) $(server_SOURCES) -qw_server_LDADD= $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/util/libQFutil.la \ - -L. -lqfnet $(NET_LIBS) $(DL_LIBS) -qw_server_DEPENDENCIES= libqfnet.a +qw_server_LDADD= -L. -lqfnet $(qf_server_LIBS) $(NET_LIBS) $(DL_LIBS) +qw_server_DEPENDENCIES= libqfnet.a $(qf_server_LIBS) # Client builds # @@ -84,14 +85,14 @@ else syscl_SRC= cl_sys_unix.c endif -client_LIBS= -L. -lqfnet \ - $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/audio/cd/libQFcd.la \ - $(top_builddir)/libs/audio/targets/libQFsound.la \ - $(top_builddir)/libs/util/libQFutil.la \ - $(SOUND_LIBS) $(NET_LIBS) -client_LIB_DEPS= libqfnet.a +qf_client_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la \ + $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/audio/cd/libQFcd.la \ + $(top_builddir)/libs/audio/targets/libQFsound.la \ + $(top_builddir)/libs/util/libQFutil.la + +client_LIBS= -L. -lqfnet $(qf_client_LIBS) $(SOUND_LIBS) $(NET_LIBS) +client_LIB_DEPS= libqfnet.a $(qf_client_LIBS) # libQFjs is seperate because it needs to be linked after when building statically client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \ @@ -117,27 +118,27 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c \ # ... Linux FBDev qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) qw_client_fbdev_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIBS) -qw_client_fbdev_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_fbdev_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIB_DEPS) # ... SciTech MGL qw_client_mgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) qw_client_mgl_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIBS) $(MGL_LIBS) -qw_client_mgl_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_mgl_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIB_DEPS) # ... Simple DirectMedia Layer, version 1.0 and higher qw_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) qw_client_sdl_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIBS) $(SDL_LIBS) -qw_client_sdl_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_sdl_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIB_DEPS) # ... Linux SVGAlib qw_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) qw_client_svga_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIBS) $(SVGA_LIBS) -qw_client_svga_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_svga_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIB_DEPS) # ... X11 qw_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) qw_client_x11_LDADD= ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) -qw_client_x11_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_x11_DEPENDENCIES=../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_LIB_DEPS) # OpenGL-using clients @@ -152,22 +153,22 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \ # ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL qw_client_3dfx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) qw_client_3dfx_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIBS) $(TDFXGL_LIBS) $(SVGA_LIBS) $(DL_LIBS) -qw_client_3dfx_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_3dfx_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIB_DEPS) # ... OpenGL in X Window qw_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) qw_client_glx_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS) -qw_client_glx_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_glx_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIB_DEPS) # ... Simple DirectMedia Layer, version 1.1 and higher, in GL mode qw_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) qw_client_sgl_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIBS) $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(DL_LIBS) -qw_client_sgl_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_sgl_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIB_DEPS) # ... SGI/Microsoft WGL (Windows OpenGL) qw_client_wgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) qw_client_wgl_LDADD= ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIBS) $(GLX_LIBS) -lgdi32 -lwinmm -qw_client_wgl_DEPENDENCIES= $(client_LIB_DEPS) +qw_client_wgl_DEPENDENCIES=../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIB_DEPS) # Stuff that doesn't get linked into an executable NEEDS to be mentioned here, # or it won't be distributed with 'make dist'