Makefile updates. Not so ugly any more, and might even work in Windows.

This commit is contained in:
Jeff Teunissen 2001-09-25 21:38:05 +00:00
parent 5195c065c6
commit 662a752f9b

View file

@ -26,49 +26,48 @@
#
# $Id$
#
AUTOMAKE_OPTIONS= foreign
AUTOMAKE_OPTIONS= foreign
# Stuff that is common to both client and server
#
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
bin_PROGRAMS = @NQ_TARGETS@
bin_PROGRAMS= @NQ_TARGETS@
EXTRA_PROGRAMS= nq-3dfx nq-fbdev nq-glx nq-mgl nq-sdl nq-sdl32 \
nq-sgl nq-svga nq-wgl nq-x11 nq-server
if ASM_ARCH
ASM = libasm.la
libasm_la_SOURCES= sys_ia32.S worlda.S
else
ASM =
libasm_la_SOURCES=
endif
noinst_LTLIBRARIES= libqfnet.la $(ASM)
libasm_la_SOURCES = sys_ia32.S worlda.S
noinst_LTLIBRARIES= libqfnet.la libasm.la
common_SOURCES= game.c host_skin.c skin.c world.c com.c
common_ldflags= -export-dynamic
# ... Networking
libqfnet_la_SOURCES= net_bsd.c net_dgrm.c net_loop.c \
net_main.c net_udp.c net_vcr.c
libqfnet_la_SOURCES= net_bsd.c net_dgrm.c net_loop.c net_main.c net_udp.c \
net_vcr.c
EXTRA_libqfnet_la_SOURCES= net_dos.c net_bw.c net_ipx.c net_mp.c \
net_win.c net_wins.c net_wipx.c
EXTRA_libqfnet_la_SOURCES= \
net_dos.c net_bw.c net_ipx.c net_mp.c net_win.c net_wins.c \
net_wipx.c
qf_client_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la \
client_LIBFILES= \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/util/libQFutil.la
$(top_builddir)/libs/video/targets/libQFjs.la
client_LIBS= libqfnet.la $(ASM) $(qf_client_LIBS) $(NET_LIBS)
client_LIB_DEPS= libqfnet.la $(ASM) $(qf_client_LIBS)
client_LIBS= $(client_LIBFILES) libasm.la libqfnet.la $(NET_LIBS)
client_LIB_DEPS=$(client_LIBFILES) libasm.la libqfnet.la
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
cl_parse.c cl_tent.c cl_view.c \
@ -77,79 +76,142 @@ client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
server_SOURCES= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
sv_move.c sv_phys.c sv_progs.c sv_user.c
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES)
combined_SOURCES= \
$(common_SOURCES) $(client_SOURCES) $(server_SOURCES)
# Software-rendering targets
# We need libQFrenderer_sw to always be static -- there's assembler in there
soft_QFLIBS= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \
$(top_builddir)/libs/models/libQFmodels_sw.la
# ... Linux FBDev
nq_fbdev_SOURCES= $(combined_SOURCES) sys_unix.c
nq_fbdev_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIBS)
nq_fbdev_LDFLAGS= $(common_ldflags)
nq_fbdev_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFfbdev.la $(client_LIB_DEPS)
nq_fbdev_SOURCES= $(combined_SOURCES) sys_unix.c
nq_fbdev_LDADD= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFfbdev.la \
$(client_LIBS)
nq_fbdev_LDFLAGS= $(common_ldflags)
nq_fbdev_DEPENDENCIES= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFfbdev.la \
$(client_LIB_DEPS)
# ... SciTech MGL
nq_mgl_SOURCES= $(combined_SOURCES) sys_win.c
nq_mgl_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIBS) $(MGL_LIBS)
nq_mgl_LDFLAGS= $(common_ldflags)
nq_mgl_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFmgl.la $(client_LIB_DEPS)
nq_mgl_SOURCES= $(combined_SOURCES) sys_win.c
nq_mgl_LDADD= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFmgl.la \
$(client_LIBS) $(MGL_LIBS)
nq_mgl_LDFLAGS= $(common_ldflags)
nq_mgl_DEPENDENCIES= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFmgl.la \
$(client_LIB_DEPS)
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.2 and higher
nq_sdl_SOURCES= $(combined_SOURCES) sys_sdl.c
nq_sdl_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIBS) $(SDL_LIBS)
nq_sdl_LDFLAGS= $(common_ldflags)
nq_sdl_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsdl.la $(client_LIB_DEPS)
# ... SDL, version 1.2 and higher
nq_sdl_SOURCES= $(combined_SOURCES) sys_sdl.c
nq_sdl_LDADD= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFsdl.la \
$(client_LIBS) $(SDL_LIBS)
nq_sdl_LDFLAGS= $(common_ldflags)
nq_sdl_DEPENDENCIES= $(soft_QFLIBS) \
$(top_builddir)/libs/video/targets/libQFsdl.la \
$(client_LIB_DEPS)
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.2 and higher
# ... 32-bit software, SDL
nq_sdl32_SOURCES= $(combined_SOURCES) sys_sdl.c
nq_sdl32_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw32.a ../../libs/models/libQFmodels_sw32.la ../../libs/video/targets/libQFsdl32.la $(client_LIBS) $(SDL_LIBS)
nq_sdl32_LDFLAGS= $(common_ldflags)
nq_sdl32_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw32.a ../../libs/models/libQFmodels_sw32.la ../../libs/video/targets/libQFsdl32.la $(client_LIB_DEPS)
nq_sdl32_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw32.a \
$(top_builddir)/libs/models/libQFmodels_sw32.la \
$(top_builddir)/libs/video/targets/libQFsdl32.la \
$(client_LIBS) $(SDL_LIBS)
nq_sdl32_LDFLAGS= $(common_ldflags)
nq_sdl32_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw32.a \
$(top_builddir)/libs/models/libQFmodels_sw32.la \
$(top_builddir)/libs/video/targets/libQFsdl32.la \
$(client_LIB_DEPS)
# ... Linux SVGAlib
nq_svga_SOURCES= $(combined_SOURCES) sys_unix.c
nq_svga_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIBS) $(SVGA_LIBS)
nq_svga_LDFLAGS= $(common_ldflags)
nq_svga_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFsvga.la $(client_LIB_DEPS)
nq_svga_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \
$(top_builddir)/libs/models/libQFmodels_sw.la \
$(top_builddir)/libs/video/targets/libQFsvga.la \
$(client_LIBS) $(SVGA_LIBS)
nq_svga_LDFLAGS= $(common_ldflags)
nq_svga_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \
$(top_builddir)/libs/models/libQFmodels_sw.la \
$(top_builddir)/libs/video/targets/libQFsvga.la \
$(client_LIB_DEPS)
# ... X11
nq_x11_SOURCES= $(combined_SOURCES) sys_unix.c
nq_x11_LDADD= ../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../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_LDFLAGS= $(common_ldflags)
nq_x11_DEPENDENCIES=../../libs/video/renderer/.libs/libQFrenderer_sw.a ../../libs/models/libQFmodels_sw.la ../../libs/video/targets/libQFx11.la $(client_LIB_DEPS)
nq_x11_SOURCES= $(combined_SOURCES) sys_unix.c
nq_x11_LDADD= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \
$(top_builddir)/libs/models/libQFmodels_sw.la \
$(top_builddir)/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_LDFLAGS= $(common_ldflags)
nq_x11_DEPENDENCIES= $(top_builddir)/libs/video/renderer/.libs/libQFrenderer_sw.a \
$(top_builddir)/libs/models/libQFmodels_sw.la \
$(top_builddir)/libs/video/targets/libQFx11.la \
$(client_LIB_DEPS)
# OpenGL-using targets
# ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL
nq_3dfx_SOURCES= $(combined_SOURCES) sys_unix.c
nq_3dfx_LDADD= ../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIBS) $(GLIDE_LIBS) $(SVGA_LIBS) $(DL_LIBS)
nq_3dfx_LDFLAGS= $(common_ldflags)
nq_3dfx_DEPENDENCIES=../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFtdfx.la $(client_LIB_DEPS)
nq_3dfx_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFtdfx.la \
$(client_LIBS) \
$(GLIDE_LIBS) $(SVGA_LIBS) $(DL_LIBS)
nq_3dfx_LDFLAGS= $(common_ldflags)
nq_3dfx_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFtdfx.la \
$(client_LIB_DEPS)
# ... OpenGL in X Window
nq_glx_SOURCES= $(combined_SOURCES) sys_unix.c
nq_glx_LDADD= ../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) $(DL_LIBS)
nq_glx_LDFLAGS= $(common_ldflags)
nq_glx_DEPENDENCIES=../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFglx.la $(client_LIB_DEPS)
nq_glx_SOURCES= $(combined_SOURCES) sys_unix.c
nq_glx_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFglx.la \
$(client_LIBS) \
$(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \
$(DL_LIBS)
nq_glx_LDFLAGS= $(common_ldflags)
nq_glx_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFglx.la \
$(client_LIB_DEPS)
# ... Simple Directmedia Layer, version 1.2 and higher, in GL mode
nq_sgl_SOURCES= $(combined_SOURCES) sys_sdl.c
nq_sgl_LDADD= ../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(DL_LIBS)
nq_sgl_LDFLAGS= $(common_ldflags)
nq_sgl_DEPENDENCIES=../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFsgl.la $(client_LIB_DEPS)
nq_sgl_SOURCES= $(combined_SOURCES) sys_sdl.c
nq_sgl_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFsgl.la \
$(client_LIBS) \
$(SDL_LIBS) $(DL_LIBS)
nq_sgl_LDFLAGS= $(common_ldflags)
nq_sgl_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFsgl.la \
$(client_LIB_DEPS)
# ... SGI/Microsoft WGL (Windows OpenGL)
nq_wgl_SOURCES= $(combined_SOURCES) conproc.c sys_win.c
nq_wgl_LDADD= ../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIBS) -lgdi32 -lcomctl32 -lwinmm
nq_wgl_LDFLAGS= $(common_ldflags)
nq_wgl_DEPENDENCIES=../../libs/video/renderer/libQFrenderer_gl.la ../../libs/models/libQFmodels_gl.la ../../libs/video/targets/libQFwgl.la $(client_LIB_DEPS)
nq_wgl_SOURCES= $(combined_SOURCES) conproc.c sys_win.c
nq_wgl_LDADD= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFwgl.la \
$(client_LIBS) -lgdi32 -lcomctl32 -lwinmm
nq_wgl_LDFLAGS= $(common_ldflags)
nq_wgl_DEPENDENCIES= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la \
$(top_builddir)/libs/video/targets/libQFwgl.la \
$(client_LIB_DEPS)
# Dedicated Server
ded_SOURCES= sys_unixd.c sv_ded.c
nq_server_SOURCES= $(common_SOURCES) $(server_SOURCES) $(ded_SOURCES)
nq_server_LDADD= libqfnet.la $(ASM)
nq_server_DEPENDENCIES= libqfnet.la $(ASM)
nq_server_LDADD= libqfnet.la libasm.la
nq_server_DEPENDENCIES= libqfnet.la libasm.la
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
# or it won't be distributed with 'make dist'