[Playerstage-commit] code/player/server Makefile.am,1.98,1.99

[Brian G. <ge...@us...>]

Update of /cvsroot/playerstage/code/player/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24782/server

Modified Files:
	Makefile.am 
Log Message:
applied patches 1671417, 1660887, 1660260

Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/Makefile.am,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** Makefile.am	5 May 2006 06:20:00 -0000	1.98
--- Makefile.am	14 Mar 2007 16:41:52 -0000	1.99
***************
*** 9,19 ****
  endif
  
! player_DEPENDENCIES = $(top_builddir)/server/libplayerdrivers/libplayerdrivers.la $(top_builddir)/libplayercore/libplayercore.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayertcp/libplayertcp.la $(top_builddir)/libplayertcp/libplayerudp.la $(top_builddir)/libplayerxdr/libplayerxdr.la
  
  # Note to everybody: please do NOT break the following assignment onto
! # separate lines with backslashes.  It makes the link line look like shit and 
  # hard to parse.  - BPG
  #
! player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/libplayerdrivers.la $(top_builddir)/libplayercore/libplayercore.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayertcp/libplayertcp.la $(top_builddir)/libplayertcp/libplayerudp.la $(top_builddir)/libplayerxdr/libplayerxdr.la @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/libreplace.la @ARTOOLKITPLUS_LIBS@
  #player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a
  
--- 9,19 ----
  endif
  
! player_DEPENDENCIES = $(top_builddir)/server/libplayerdrivers/libplayerdrivers.la $(top_builddir)/libplayercore/libplayercore.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la $(top_builddir)/libplayertcp/libplayertcp.la $(top_builddir)/libplayertcp/libplayerudp.la $(top_builddir)/libplayerxdr/libplayerxdr.la
  
  # Note to everybody: please do NOT break the following assignment onto
! # separate lines with backslashes.  It makes the link line look like shit and
  # hard to parse.  - BPG
  #
! player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/libplayerdrivers.la $(top_builddir)/libplayercore/libplayercore.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la $(top_builddir)/libplayertcp/libplayertcp.la $(top_builddir)/libplayertcp/libplayerudp.la $(top_builddir)/libplayerxdr/libplayerxdr.la @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/libreplace.la @ARTOOLKITPLUS_LIBS@
  #player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a