mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
duplicate file name cleanup and make dist works
This commit is contained in:
Bill Currie
parent
630e064150
commit
a1d2cf3532
11 changed files with 139 additions and 72 deletions
|
|
@ -2,15 +2,22 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
plugin_LTLIBRARIES= @SND_REND_TARGETS@
|
||||
EXTRA_LTLIBRARIES= libsnd_render_default.la
|
||||
noinst_LTLIBRARIES= libasm.la
|
||||
|
||||
if ASM_ARCH
|
||||
libasm_la_SOURCES= snd_mixa.S
|
||||
asm= libasm.la
|
||||
else
|
||||
libasm_la_SOURCES=
|
||||
asm=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= $(asm)
|
||||
|
||||
libasm_la_SOURCES= snd_mixa.S
|
||||
|
||||
libsnd_render_default_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
|
||||
libsnd_render_default_la_LIBADD= libasm.la
|
||||
libsnd_render_default_la_DEPENDENCIES= libasm.la
|
||||
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c
|
||||
if ASM_ARCH
|
||||
libsnd_render_default_la_LIBADD= $(asm)
|
||||
libsnd_render_default_la_DEPENDENCIES= $(asm)
|
||||
endif
|
||||
|
||||
EXTRA_DIST= $(libasm_la_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,21 +1,34 @@
|
|||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
noinst_LTLIBRARIES= libalias_gl.la libalias_sw.la libalias_sw32.la
|
||||
|
||||
if BUILD_GL
|
||||
libalias_gl_la_SOURCES= gl_mesh.c gl_model_alias.c model_alias.c
|
||||
gl= libalias_gl.la
|
||||
else
|
||||
libalias_gl_la_SOURCES=
|
||||
gl=
|
||||
endif
|
||||
|
||||
if BUILD_SW
|
||||
libalias_sw_la_SOURCES= sw_model_alias.c model_alias.c
|
||||
sw= libalias_sw.la
|
||||
else
|
||||
libalias_sw_la_SOURCES=
|
||||
sw=
|
||||
endif
|
||||
|
||||
if BUILD_SW32
|
||||
libalias_sw32_la_SOURCES= sw32_model_alias.c model_alias.c
|
||||
sw32= libalias_sw32.la
|
||||
else
|
||||
libalias_sw32_la_SOURCES=
|
||||
sw32=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= $(gl) $(sw) $(sw32)
|
||||
|
||||
alias_src= model_alias.c
|
||||
gl_src= gl_mesh.c gl_model_alias.c
|
||||
sw_src= sw_model_alias.c
|
||||
sw32_src= sw32_model_alias.c
|
||||
|
||||
libalias_gl_la_SOURCES= $(gl_src) $(alias_src)
|
||||
|
||||
libalias_sw_la_SOURCES= $(sw_src) $(alias_src)
|
||||
|
||||
libalias_sw32_la_SOURCES= $(sw32_src) $(alias_src)
|
||||
|
||||
EXTRA_DIST= $(gl_src) $(sw_src) $(sw32_src) $(alias_src)
|
||||
|
|
|
|||
|
|
@ -1,23 +1,36 @@
|
|||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
noinst_LTLIBRARIES= libbrush.la libbrush_gl.la libbrush_sw.la libbrush_sw32.la
|
||||
|
||||
libbrush_la_SOURCES= model_brush.c
|
||||
|
||||
if BUILD_GL
|
||||
libbrush_gl_la_SOURCES= gl_model_brush.c model_brush.c
|
||||
gl= libbrush_gl.la
|
||||
else
|
||||
libbrush_gl_la_SOURCES=
|
||||
gl=
|
||||
endif
|
||||
|
||||
if BUILD_SW
|
||||
libbrush_sw_la_SOURCES= sw_model_brush.c model_brush.c
|
||||
sw= libbrush_sw.la
|
||||
else
|
||||
libbrush_sw_la_SOURCES=
|
||||
sw=
|
||||
endif
|
||||
|
||||
if BUILD_SW32
|
||||
libbrush_sw32_la_SOURCES=sw32_model_brush.c model_brush.c
|
||||
sw32= libbrush_sw32.la
|
||||
else
|
||||
libbrush_sw32_la_SOURCES=
|
||||
sw32=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= libbrush.la $(gl) $(sw) $(sw32)
|
||||
|
||||
brush_src= model_brush.c
|
||||
gl_src= gl_model_brush.c
|
||||
sw_src= sw_model_brush.c
|
||||
sw32_src= sw32_model_brush.c
|
||||
|
||||
libbrush_la_SOURCES= $(brush_src)
|
||||
|
||||
libbrush_gl_la_SOURCES= $(gl_src) $(brush_src)
|
||||
|
||||
libbrush_sw_la_SOURCES= $(sw_src) $(brush_src)
|
||||
|
||||
libbrush_sw32_la_SOURCES= $(sw32_src) $(brush_src)
|
||||
|
||||
EXTRA_DIST= $(gl_src) $(sw_src) $(sw32_src) $(brush_src)
|
||||
|
|
|
|||
|
|
@ -1,21 +1,34 @@
|
|||
INCLUDES= -I$(top_srcdir)/include
|
||||
|
||||
noinst_LTLIBRARIES= libsprite_gl.la libsprite_sw.la libsprite_sw32.la
|
||||
|
||||
if BUILD_GL
|
||||
libsprite_gl_la_SOURCES= gl_model_sprite.c model_sprite.c
|
||||
gl= libsprite_gl.la
|
||||
else
|
||||
libsprite_gl_la_SOURCES=
|
||||
gl=
|
||||
endif
|
||||
|
||||
if BUILD_SW
|
||||
libsprite_sw_la_SOURCES= sw_model_sprite.c model_sprite.c
|
||||
sw= libsprite_sw.la
|
||||
else
|
||||
libsprite_sw_la_SOURCES=
|
||||
sw=
|
||||
endif
|
||||
|
||||
if BUILD_SW32
|
||||
libsprite_sw32_la_SOURCES= sw32_model_sprite.c model_sprite.c
|
||||
sw32= libsprite_sw32.la
|
||||
else
|
||||
libsprite_sw32_la_SOURCES=
|
||||
sw32=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= $(gl) $(sw) $(sw32)
|
||||
|
||||
sprite_src= model_sprite.c
|
||||
gl_src= gl_model_sprite.c
|
||||
sw_src= sw_model_sprite.c
|
||||
sw32_src= sw32_model_sprite.c
|
||||
|
||||
libsprite_gl_la_SOURCES= $(gl_src) $(sprite_src)
|
||||
|
||||
libsprite_sw_la_SOURCES= $(sw_src) $(sprite_src)
|
||||
|
||||
libsprite_sw32_la_SOURCES= $(sw32_src) $(sprite_src)
|
||||
|
||||
EXTRA_DIST= $(gl_src) $(sw_src) $(sw32_src) $(sprite_src)
|
||||
|
|
|
|||
|
|
@ -2,20 +2,22 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
lib_LTLIBRARIES= libQFutil.la
|
||||
|
||||
noinst_LTLIBRARIES= libasm.la
|
||||
|
||||
if ASM_ARCH
|
||||
libasm_la_SOURCES= math.S
|
||||
noinst_LTLIBRARIES= libasm.la
|
||||
else
|
||||
libasm_la_SOURCES=
|
||||
noinst_LTLIBRARIES=
|
||||
endif
|
||||
EXTRA_libasm_la_SOURCES=math.S
|
||||
|
||||
asm_src= math.S
|
||||
|
||||
libasm_la_SOURCES= $(asm_src)
|
||||
|
||||
|
||||
fnmatch_src= fnmatch.c dirent.c
|
||||
if BUILD_FNMATCH
|
||||
fnmatch_SRC= fnmatch.c dirent.c
|
||||
fnmatch= $(fnmatch_src)
|
||||
else
|
||||
fnmatch_SRC=
|
||||
fnmatch=
|
||||
endif
|
||||
|
||||
libQFutil_la_LDFLAGS= -version-info 1:0:0
|
||||
|
|
@ -25,6 +27,6 @@ libQFutil_la_SOURCES= \
|
|||
checksum.c cmd.c console.c con_print.c crc.c cvar.c fendian.c hash.c \
|
||||
info.c link.c mathlib.c mdfour.c msg.c pcx.c plugin.c qargs.c \
|
||||
qendian.c qfplist.c quakefs.c quakeio.c sizebuf.c sys.c tga.c va.c \
|
||||
ver_check.c wad.c zone.c $(fnmatch_SRC)
|
||||
ver_check.c wad.c zone.c $(fnmatch)
|
||||
|
||||
EXTRA_libQFutil_la_SOURCES= fnmatch.c dirent.c
|
||||
EXTRA_DIST= $(asm_src) $(fnmatch_src)
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ gl_src = \
|
|||
|
||||
libgl_la_SOURCES= $(gl_src)
|
||||
|
||||
EXTRA_libgl_la_SOURCES = $(gl_src)
|
||||
EXTRA_DIST = $(gl_src)
|
||||
|
|
|
|||
|
|
@ -32,5 +32,4 @@ libsw_la_LIBADD= $(asm)
|
|||
libsw_la_DEPENDENCIES= $(asm)
|
||||
endif
|
||||
|
||||
EXTRA_libasm_la_SOURCES= $(asm_src)
|
||||
EXTRA_libsw_la_SOURCES= $(sw_src)
|
||||
EXTRA_DIST= $(sw_src) $(asm_src)
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ sw32_src= \
|
|||
|
||||
libsw32_la_SOURCES= $(sw32_src)
|
||||
|
||||
EXTRA_libsw32_la_SOURCES= $(sw32_src)
|
||||
EXTRA_DIST= $(sw32_src)
|
||||
|
|
|
|||
|
|
@ -6,36 +6,43 @@ EXTRA_LTLIBRARIES= \
|
|||
libQFjs.la libQFfbdev.la libQFglx.la libQFsvga.la libQFx11.la \
|
||||
libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la
|
||||
|
||||
noinst_LTLIBRARIES= libasm.la @VID_TARGETS_NOINST@
|
||||
|
||||
if ASM_ARCH
|
||||
libasm_la_SOURCES= d_copy.S
|
||||
asm= libasm.la
|
||||
else
|
||||
libasm_la_SOURCES=
|
||||
asm=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= $(asm) @VID_TARGETS_NOINST@
|
||||
|
||||
libasm_la_SOURCES= d_copy.S
|
||||
|
||||
joy_linux_src= joy_linux.c
|
||||
joy_win_src= joy_win.c
|
||||
joy_null_src= joy_null.c
|
||||
if JOYTYPE_LINUX
|
||||
joy_src= $(joy_linux_src)
|
||||
else
|
||||
if JOYTYPE_WIN32
|
||||
joy_src= $(joy_win_src)
|
||||
else
|
||||
joy_src= $(joy_null_src)
|
||||
endif
|
||||
endif
|
||||
EXTRA_libasm_la_SOURCES= d_copy.S
|
||||
|
||||
libQFjs_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
|
||||
libQFjs_la_CFLAGS= $(JOY_CFLAGS)
|
||||
if JOYTYPE_LINUX
|
||||
libQFjs_la_SOURCES= joy.c joy_linux.c
|
||||
else
|
||||
if JOYTYPE_WIN32
|
||||
libQFjs_la_SOURCES= joy.c joy_win.c
|
||||
else
|
||||
libQFjs_la_SOURCES= joy.c joy_null.c
|
||||
endif
|
||||
endif
|
||||
EXTRA_libQFjs_la_SOURCES= joy.c joy_linux.c joy_null.c joy_win.c
|
||||
libQFjs_la_SOURCES= joy.c $(joy_src)
|
||||
EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
|
||||
|
||||
in_common_SOURCE= in_common.c in_event.c keys.c old_keys.c
|
||||
|
||||
#
|
||||
# Linux FBdev
|
||||
#
|
||||
fbdev_c= fbset_modes_y.c fbset_modes_l.c
|
||||
fbdev_h= fbset_modes_y.h
|
||||
YFLAGS = -d
|
||||
YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h \
|
||||
fbset_modes_y.tab.h fbset_modes_l.c
|
||||
YACCLEX_CLEANFILES= $(fbdev_c) $(fbdev_h)
|
||||
|
||||
libQFfbdev_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir)
|
||||
libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \
|
||||
|
|
@ -93,3 +100,5 @@ libQFx11_la_SOURCES= $(in_common_SOURCE) in_x11.c vid.c context_x11.c dga_check.
|
|||
|
||||
# Kill the temp files, hopefully.
|
||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||
|
||||
EXTRA_DIST= $(libasm_la_SOURCES) $(fbdev_c) $(fbdev_h)
|
||||
|
|
|
|||
|
|
@ -39,12 +39,16 @@ EXTRA_PROGRAMS= nq-fbdev nq-glx nq-mgl nq-sdl nq-sdl32 nq-sgl nq-svga nq-wgl \
|
|||
nq-x11 nq-server
|
||||
|
||||
if ASM_ARCH
|
||||
libasm_la_SOURCES= sys_ia32.S worlda.S
|
||||
asm= libasm.la
|
||||
else
|
||||
libasm_la_SOURCES=
|
||||
asm=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= libqfnet.la libasm.la
|
||||
asm_src= sys_ia32.S worlda.S
|
||||
|
||||
libasm_la_SOURCES= $(asm_src)
|
||||
|
||||
noinst_LTLIBRARIES= libqfnet.la $(asm)
|
||||
|
||||
common_sources= game.c host_skin.c skin.c world.c com.c
|
||||
|
||||
|
|
@ -203,7 +207,7 @@ 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'
|
||||
EXTRA_DIST= sys_win.c sys_unix.c #nq.dsp
|
||||
EXTRA_DIST= $(asm_src)
|
||||
|
||||
# Kill the temp files, hopefully.
|
||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||
|
|
|
|||
|
|
@ -40,12 +40,16 @@ EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-mgl qw-client-sdl \
|
|||
qw-client-x11 qw-server qw-master
|
||||
|
||||
if ASM_ARCH
|
||||
libasm_la_SOURCES= sys_x86.S worlda.S
|
||||
asm= libasm.la
|
||||
else
|
||||
libasm_la_SOURCES=
|
||||
asm=
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES= libqfnet.la libasm.la
|
||||
asm_src= sys_x86.S worlda.S
|
||||
|
||||
libasm_la_SOURCES= $(asm_src)
|
||||
|
||||
noinst_LTLIBRARIES= libqfnet.la $(asm)
|
||||
|
||||
common_sources= buildnum.c com.c game.c msg_ucmd.c pmove.c pmovetst.c \
|
||||
net_packetlog.c
|
||||
|
|
@ -53,12 +57,15 @@ common_sources= buildnum.c com.c game.c msg_ucmd.c pmove.c pmovetst.c \
|
|||
common_ldflags= -export-dynamic
|
||||
|
||||
# ... Network type
|
||||
ipv6_src= net_udp6.c
|
||||
ipv4_src= net_udp.c
|
||||
if NETTYPE_IPV6
|
||||
libqfnet_la_SOURCES= net_chan.c net_udp6.c
|
||||
ipvX_src= $(ipv6_src)
|
||||
else
|
||||
libqfnet_la_SOURCES= net_chan.c net_udp.c
|
||||
ipvX_src= $(ipv4_src)
|
||||
endif
|
||||
EXTRA_libqfnet_la_SOURCES= net_chan.c net_udp.c net_udp6.c
|
||||
libqfnet_la_SOURCES= net_chan.c $(ipvX_src)
|
||||
EXTRA_libqfnet_la_SOURCES= $(ipv4_src) $(ipv6_src)
|
||||
|
||||
# Server builds
|
||||
#
|
||||
|
|
@ -221,7 +228,7 @@ qw_client_wgl_DEPENDENCIES= \
|
|||
|
||||
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
|
||||
# or it won't be distributed with 'make dist'
|
||||
EXTRA_DIST= cl_sys_win.c sv_sys_win.c cl_sys_sdl.c
|
||||
EXTRA_DIST= $(asm_src)
|
||||
|
||||
# Kill the temp files, hopefully.
|
||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||
|
|
|
|||
Loading…
Reference in a new issue