Nuke libQFbuiltins.

The gib and "common" builtins are now part of libQFruamoko.
This commit is contained in:
Bill Currie 2011-01-04 21:21:19 +09:00
parent a27ea057c4
commit a85c0713aa
10 changed files with 5 additions and 18 deletions

View file

@ -10,7 +10,6 @@
libs/console/Makefile
libs/gamecode/Makefile
libs/gamecode/engine/Makefile
libs/gamecode/builtins/Makefile
libs/gib/Makefile
libs/image/Makefile
libs/models/Makefile

View file

@ -545,7 +545,7 @@ QF_DEPS(QFVIS,
)
QF_DEPS(QWAQ,
[],
[$(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la],
[$(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la],
[$(WIN32_LIBS)],
)
QF_DEPS(CARNE,

View file

@ -21,7 +21,7 @@ libQFconsole_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la
libQFconsole_la_SOURCES= $(common_sources)
console_client_la_LDFLAGS= $(plugin_ldflags)
console_client_la_LIBADD= $(plugin_libadd) libQFconsole.la $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la
console_client_la_LIBADD= $(plugin_libadd) libQFconsole.la $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/ruamoko/libQFruamoko.la
console_client_la_SOURCES= $(client_sources)
console_server_la_LDFLAGS= $(plugin_ldflags)

View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
SUBDIRS= engine builtins
SUBDIRS= engine
clean-local:
rm -f *.a

View file

@ -1,10 +0,0 @@
AUTOMAKE_OPTIONS= foreign
CFLAGS+= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFgamecode_builtins.la
libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFgamecode_builtins_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la
libQFgamecode_builtins_la_SOURCES= pr_cmds.c bi_gib.c

View file

@ -6,8 +6,9 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFruamoko.la
libQFruamoko_la_LDFLAGS= -version-info 1:0:0 -no-undefined
libQFruamoko_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
libQFruamoko_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la
libQFruamoko_la_SOURCES= \
bi_gib.c pr_cmds.c \
rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
rua_math.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c rua_script.c \
rua_string.c

View file

@ -63,7 +63,6 @@ server_LIBFILES= \
common_LIBFILES= \
$(top_builddir)/libs/net/libnet_main.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/image/libQFimage.la \
$(top_builddir)/libs/gib/libQFgib.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \

View file

@ -72,7 +72,6 @@ qw_server_LIBS= \
$(top_builddir)/libs/net/libnet_chan.la \
$(top_builddir)/libs/ruamoko/libQFruamoko.la \
$(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/gib/libQFgib.la \
@ -96,7 +95,6 @@ qw_client_LIBS= \
$(top_builddir)/libs/net/libnet_chan.la \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/video/targets/libQFjs.la \
$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \