Update of /cvsroot/playerstage/code/player/libplayerxdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14914/libplayerxdr
Modified Files:
Makefile.am functiontable.c playerxdr.pc.in
Log Message:
removed circular build dependency
Index: functiontable.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/functiontable.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** functiontable.c 14 Mar 2007 16:41:52 -0000 1.79
--- functiontable.c 16 Mar 2007 15:06:41 -0000 1.80
***************
*** 33,37 ****
#include <stdio.h>
! #include <libplayercore/error.h>
#include "playerxdr.h"
--- 33,39 ----
#include <stdio.h>
! // Can't use libplayererror here because of an unresolved circular build
! // dependency
! //#include <libplayercore/error.h>
#include "playerxdr.h"
***************
*** 606,610 ****
}
}
! PLAYER_ERROR("unable to find entry to replace");
return(-1);
}
--- 608,615 ----
}
}
! // Can't use libplayererror here because of an unresolved circular build
! // dependency
! //PLAYER_ERROR("unable to find entry to replace");
! puts("playerxdr_ftable_add: unable to find entry to replace");
return(-1);
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.am 7 Mar 2006 12:01:55 -0000 1.17
--- Makefile.am 16 Mar 2007 15:06:41 -0000 1.18
***************
*** 26,30 ****
libplayerxdr_la_SOURCES = playerxdr.c playerxdr.h functiontable.h
functiontable.c
! libplayerxdr_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
$(top_builddir)/libplayercore/libplayererror.la
! libplayerxdr_la_DEPENDENCIES = $(top_builddir)/libplayercore/libplayererror.la
--- 26,35 ----
libplayerxdr_la_SOURCES = playerxdr.c playerxdr.h functiontable.h
functiontable.c
! # Can't use libplayererror here because of an unresolved circular build
! # dependency
! #libplayerxdr_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
$(top_builddir)/libplayercore/libplayererror.la
! libplayerxdr_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
! # Can't use libplayererror here because of an unresolved circular build
! # dependency
! #libplayerxdr_la_DEPENDENCIES =
$(top_builddir)/libplayercore/libplayererror.la
Index: playerxdr.pc.in
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/playerxdr.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playerxdr.pc.in 22 Jan 2006 04:26:21 -0000 1.4
--- playerxdr.pc.in 16 Mar 2007 15:06:41 -0000 1.5
***************
*** 6,10 ****
Description: Player XDR messaging library - part of the Player/Stage Project
Version: @VERSION@
! Requires: playererror
Libs: -L${prefix}/lib -lplayerxdr
Cflags: -I${prefix}/include/player-2.0
--- 6,10 ----
Description: Player XDR messaging library - part of the Player/Stage Project
Version: @VERSION@
! Requires:
Libs: -L${prefix}/lib -lplayerxdr
Cflags: -I${prefix}/include/player-2.0
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
