From d63243380fe24c07d3daa5de5e0a5e68f0e52bba Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Fri, 28 Sep 2001 10:31:20 +0000 Subject: [PATCH] Aaaaaaand, it's done! Special note: I hope to never do this again. :) --- bootstrap | 2 +- configure.ac | 25 +++++++++++------- libs/audio/cd/Makefile.am | 14 +++++----- libs/audio/renderer/Makefile.am | 6 ++--- libs/audio/targets/Makefile.am | 22 +++++++--------- libs/console/Makefile.am | 33 +++++++++-------------- libs/gamecode/builtins/Makefile.am | 8 +++--- libs/gamecode/engine/Makefile.am | 9 +++---- libs/util/Makefile.am | 42 ++++++++++++++---------------- 9 files changed, 73 insertions(+), 88 deletions(-) diff --git a/bootstrap b/bootstrap index b452b48b7..2b4f7f49c 100755 --- a/bootstrap +++ b/bootstrap @@ -28,4 +28,4 @@ else exit 1 fi -aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf +libtoolize --automake && automake --add-missing && aclocal && autoheader && autoconf diff --git a/configure.ac b/configure.ac index 730c1dd65..5f4558373 100644 --- a/configure.ac +++ b/configure.ac @@ -977,19 +977,19 @@ AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath") AC_ARG_WITH(plugin-path, [ --with-plugin-path=DIR Use DIR for loading plugins, defaults to \${libdir}/quakeforge], -pluginpath=$withval, pluginpath="auto") +plugindir=$withval, plugindir="auto") PLUGINDIR="$libdir/$PACKAGE" -if test "x$pluginpath" = "xauto" -o "x$pluginpath" = "xyes" -o "x$pluginpath" = "x"; then - eval pluginpath="$PLUGINDIR" -elif test "x$pluginpath" = xno; then - pluginpath="." +if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then + eval plugindir="$PLUGINDIR" +elif test "x$plugindir" = xno; then + plugindir="." else - PLUGINDIR=$pluginpath - eval pluginpath="$PLUGINDIR" + PLUGINDIR=$plugindir + eval plugindir="$PLUGINDIR" fi -AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$pluginpath") -AC_SUBST(pluginpath) +AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$plugindir") +AC_SUBST(plugindir) AC_SUBST(PLUGINDIR) dnl CFLAGS for release and devel versions @@ -1274,6 +1274,7 @@ CD_TARGETS="" SND_PLUGIN_TARGETS="libsnd_output_disk.la" SND_REND_TARGETS="" SND_TARGETS="" +VID_MODEL_TARGETS="" VID_REND_TARGETS="" VID_TARGETS="" VID_TARGETS_NOINST="" @@ -1369,12 +1370,15 @@ fi if test "x$BUILD_SW" = xyes; then VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la" + VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la" fi if test "x$BUILD_SW32" = xyes; then VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw32.la" + VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw32.la" fi if test "x$BUILD_GL" = xyes; then VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_gl.la" + VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_gl.la" fi AC_SUBST(CAN_BUILD_GL) @@ -1433,6 +1437,7 @@ AC_SUBST(CD_TARGETS) AC_SUBST(SND_PLUGIN_TARGETS) AC_SUBST(SND_REND_TARGETS) AC_SUBST(SND_TARGETS) +AC_SUBST(VID_MODEL_TARGETS) AC_SUBST(VID_REND_TARGETS) AC_SUBST(VID_TARGETS) AC_SUBST(VID_TARGETS_NOINST) @@ -1526,7 +1531,7 @@ AC_MSG_RESULT([ Shared game data directory: $sharepath Per-user game data directory: $userpath - Plugin load directory: $pluginpath + Plugin load directory: $plugindir Global configuration file: $globalconf User configuration file: $userconf ]) diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am index 84e23f9aa..8e7883e92 100644 --- a/libs/audio/cd/Makefile.am +++ b/libs/audio/cd/Makefile.am @@ -1,23 +1,21 @@ INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) -pkglibdir = @PLUGINDIR@ - -pkglib_LTLIBRARIES= @CD_PLUGIN_TARGETS@ +plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@ EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la -libcd_linux_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libcd_linux_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libcd_linux_la_SOURCES= cd_linux.c -libcd_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libcd_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libcd_sdl_la_LIBADD= $(SDL_LIBS) libcd_sdl_la_SOURCES= cd_sdl.c -libcd_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libcd_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libcd_sgi_la_LIBADD= $(SGI_CD_LIBS) libcd_sgi_la_SOURCES= cd_sgi.c -libcd_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libcd_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libcd_win_la_SOURCES= cd_win.c -libcd_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libcd_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libcd_null_la_SOURCES= cd_null.c diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am index 22112351d..5c0a707d9 100644 --- a/libs/audio/renderer/Makefile.am +++ b/libs/audio/renderer/Makefile.am @@ -1,8 +1,6 @@ INCLUDES= -I$(top_srcdir)/include -libdir= @PLUGINDIR@ - -lib_LTLIBRARIES= @SND_REND_TARGETS@ +plugin_LTLIBRARIES= @SND_REND_TARGETS@ EXTRA_LTLIBRARIES= libsnd_render_default.la noinst_LTLIBRARIES= libasm.la @@ -12,7 +10,7 @@ else libasm_la_SOURCES= endif -libsnd_render_default_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +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 diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index 0f9db510f..f7184adc9 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -1,39 +1,37 @@ INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS) -libdir = @PLUGINDIR@ - -lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@ +plugin_LTLIBRARIES = @SND_PLUGIN_TARGETS@ EXTRA_LTLIBRARIES = libsnd_output_sdl.la libsnd_output_alsa0_5.la libsnd_output_alsa0_9.la libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la -libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_sdl_la_LIBADD= $(SDL_LIBS) libsnd_output_sdl_la_SOURCES= snd_sdl.c -libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_alsa0_5_la_LIBADD= $(ALSA_LIBS) libsnd_output_alsa0_5_la_SOURCES= snd_alsa_0_5.c -libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_alsa0_9_la_LIBADD= $(ALSA_LIBS) libsnd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c -libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_oss_la_LIBADD= $(OSS_LIBS) libsnd_output_oss_la_SOURCES= snd_oss.c -libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_sgi_la_LIBADD= $(SGISND_LIBS) libsnd_output_sgi_la_SOURCES= snd_sgi.c -libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_sun_la_SOURCES= snd_sun.c -libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_win_la_LIBADD= $(WINSND_LIBS) libsnd_output_win_la_SOURCES= snd_win.c -libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_disk_la_SOURCES= snd_disk.c -libsnd_output_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) +libsnd_output_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir) libsnd_output_null_la_SOURCES= snd_null.c diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index 16fa689a6..75777e6e4 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -1,27 +1,18 @@ INCLUDES= -I$(top_srcdir)/include -pkglibdir = @PLUGINDIR@ +lib_LTLIBRARIES= libQFconsole.la +plugin_LTLIBRARIES= libconsole_client.la libconsole_server.la -lib_LTLIBRARIES = libQFconsole.la -pkglib_LTLIBRARIES = libconsole_client.la libconsole_server.la +common_sources= complete.c console.c inputline.c list.c +client_sources= client.c +server_sources= server.c -common_sources = complete.c console.c inputline.c list.c -client_sources = client.c -server_sources = server.c +libQFconsole_la_LDFLAGS= -version-info 1:0:0 +libQFconsole_la_SOURCES= $(common_sources) -libQFconsole_la_LDFLAGS = -version-info 1:0:0 -libQFconsole_la_LIBADD = -libQFconsole_la_SOURCES = $(common_sources) -libQFconsole_la_DEPENDENCIES = +libconsole_client_la_LDFLAGS= -version-info 1:0:0 +libconsole_client_la_SOURCES= $(client_sources) -libconsole_client_la_LDFLAGS = -version-info 1:0:0 -libconsole_client_la_LIBADD = -libconsole_client_la_SOURCES = $(client_sources) -libconsole_client_la_DEPENDENCIES = - -libconsole_server_la_LDFLAGS = -version-info 1:0:0 -libconsole_server_la_LIBADD = $(CURSES_LIBS) -libconsole_server_la_SOURCES = $(server_sources) -libconsole_server_la_DEPENDENCIES = - -LIBLIST = libQFconsole.la +libconsole_server_la_LDFLAGS= -version-info 1:0:0 +libconsole_server_la_LIBADD= $(CURSES_LIBS) +libconsole_server_la_SOURCES= $(server_sources) diff --git a/libs/gamecode/builtins/Makefile.am b/libs/gamecode/builtins/Makefile.am index 7a189cc4b..2f399beb6 100644 --- a/libs/gamecode/builtins/Makefile.am +++ b/libs/gamecode/builtins/Makefile.am @@ -1,8 +1,6 @@ INCLUDES= -I$(top_srcdir)/include -lib_LTLIBRARIES = libQFgamecode_builtins.la +lib_LTLIBRARIES= libQFgamecode_builtins.la -libQFgamecode_builtins_la_LDFLAGS = -version-info 1:0:0 -libQFgamecode_builtins_la_SOURCES = pr_cmds.c - -LIBLIST = libQFgamecode_builtins.la @LIBRARY_SEARCH_PATH@ +libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0 +libQFgamecode_builtins_la_SOURCES= pr_cmds.c diff --git a/libs/gamecode/engine/Makefile.am b/libs/gamecode/engine/Makefile.am index 344077e4b..aeea03032 100644 --- a/libs/gamecode/engine/Makefile.am +++ b/libs/gamecode/engine/Makefile.am @@ -1,8 +1,7 @@ INCLUDES= -I$(top_srcdir)/include -lib_LTLIBRARIES = libQFgamecode.la +lib_LTLIBRARIES= libQFgamecode.la -libQFgamecode_la_LDFLAGS = -version-info 1:0:0 -libQFgamecode_la_SOURCES = pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c - -LIBLIST = libQFgamecode.la @LIBRARY_SEARCH_PATH@ +libQFgamecode_la_LDFLAGS= -version-info 1:0:0 +libQFgamecode_la_SOURCES= \ + pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index 5e12024e6..b286ee22a 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -1,32 +1,30 @@ INCLUDES= -I$(top_srcdir)/include -lib_LTLIBRARIES = libQFutil.la +lib_LTLIBRARIES= libQFutil.la -if BUILD_FNMATCH -fnmatch_SRC = fnmatch.c dirent.c -else -fnmatch_SRC = -endif - -noinst_LTLIBRARIES = libasm.la +noinst_LTLIBRARIES= libasm.la if ASM_ARCH -libasm_la_SOURCES = math.S +libasm_la_SOURCES= math.S else -libasm_la_SOURCES = +libasm_la_SOURCES= +endif +EXTRA_libasm_la_SOURCES=math.S + + +if BUILD_FNMATCH +fnmatch_SRC= fnmatch.c dirent.c +else +fnmatch_SRC= endif -libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) $(DL_LIBS) -libQFutil_la_LIBADD = libasm.la -libQFutil_la_DEPENDENCIES = libasm.la -libQFutil_la_SOURCES = \ +libQFutil_la_LDFLAGS= -version-info 1:0:0 +libQFutil_la_LIBADD= libasm.la $(Z_LIBS) $(DL_LIBS) +libQFutil_la_DEPENDENCIES= libasm.la +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) + 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) -LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@ - -EXTRA_DIST = fnmatch.c dirent.c +EXTRA_libQFutil_la_SOURCES= fnmatch.c dirent.c