Clean up plugin_ldadd and plugin_ldflags

This commit is contained in:
Bill Currie 2012-02-07 12:52:12 +09:00
parent b5019c8e33
commit b7e5ad6306
2 changed files with 2 additions and 6 deletions

View file

@ -445,14 +445,10 @@ if test "x$static_plugins" = xyes; then
SOUND_TYPES="$SOUND_TYPES (static)" SOUND_TYPES="$SOUND_TYPES (static)"
CDTYPE="$CDTYPE (static)" CDTYPE="$CDTYPE (static)"
fi fi
plugin_ldflags="$plugin_ldflags"
else
plugin_ldflags="$plugin_ldflags"
fi fi
dnl Do not use -module here, it belongs in makefile.am due to automake dnl Do not use -module here, it belongs in makefile.am due to automake
dnl needing it there to work correctly dnl needing it there to work correctly
plugin_ldflags="$plugin_ldflags"
SERVER_PLUGIN_STATIC_LIBS="" SERVER_PLUGIN_STATIC_LIBS=""
CLIENT_PLUGIN_STATIC_LIBS="" CLIENT_PLUGIN_STATIC_LIBS=""
CD_PLUGIN_STATIC_LIBS="" CD_PLUGIN_STATIC_LIBS=""
@ -538,8 +534,6 @@ AC_SUBST(VID_MODEL_TARGETS)
AC_SUBST(VID_REND_TARGETS) AC_SUBST(VID_REND_TARGETS)
AC_SUBST(VID_REND_NOINST_TARGETS) AC_SUBST(VID_REND_NOINST_TARGETS)
AC_SUBST(VID_TARGETS) AC_SUBST(VID_TARGETS)
AC_SUBST(plugin_ldflags)
AC_SUBST(plugin_libadd)
QF_DEPS(BSP2IMG, QF_DEPS(BSP2IMG,
[], [],

View file

@ -253,6 +253,8 @@ AC_SUBST(AS)
AC_SUBST(ASFLAGS) AC_SUBST(ASFLAGS)
AC_SUBST(CCAS) AC_SUBST(CCAS)
AC_SUBST(CCASFLAGS) AC_SUBST(CCASFLAGS)
AC_SUBST(plugin_ldflags)
AC_SUBST(plugin_libadd)
dnl Finalization of CFLAGS, LDFLAGS, and LIBS dnl Finalization of CFLAGS, LDFLAGS, and LIBS
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)