Pre-release cleanup: rename libgrasrl to libgras and libgrassg to libsimgrid

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@718 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index f0b004f..6072edc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,29 +78,29 @@ dnl ####[ Search libs ]#######################################################
 dnl A CI_PACKAGE([S imGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
 dnl A M_CONDITIONAL(HAVE_SG,test x$HAVE_SimGrid = xyes)
 dnl if test x$HAVE_SimGrid = xyes; then
-dnl   GRAS_SG_DEP="-lsimgrid"
+dnl   SIMGRID_DEP="-lsimgrid"
 dnl else
-  GRAS_SG_DEP=""
+  SIMGRID_DEP=""
 dnl fi
-AC_SUBST([GRAS_SG_DEP])
+AC_SUBST([SIMGRID_DEP])
 
 
 dnl A C_CHECK_LIB(pthread, pthread_mutex_lock, LIBS="$LIBS -lpthread")
-GRAS_RL_DEP=""
-AC_CHECK_LIB(nsl, gethostbyname, [GRAS_RL_DEP="$GRAS_RL_DEP -lnsl"])
-AC_CHECK_LIB(socket, connect,    [GRAS_RL_DEP="$GRAS_RL_DEP -lsocket"])
+GRAS_DEP=""
+AC_CHECK_LIB(nsl, gethostbyname, [GRAS_DEP="$GRAS_DEP -lnsl"])
+AC_CHECK_LIB(socket, connect,    [GRAS_DEP="$GRAS_DEP -lsocket"])
 
-AC_MSG_CHECKING(for extra dependencies of libgrasrl)
+AC_MSG_CHECKING(for extra dependencies of libgras)
 case $host_os in
-  *mingw* ) GRAS_RL_DEP=-lws2_32;;
+  *mingw* ) GRAS_DEP=-lws2_32;;
 esac
           
-if test "x$GRAS_RL_DEP" = x; then 
+if test "x$GRAS_DEP" = x; then 
    AC_MSG_RESULT(none)
 else
-   AC_MSG_RESULT($GRAS_RL_DEP)
+   AC_MSG_RESULT($GRAS_DEP)
 fi
-AC_SUBST([GRAS_RL_DEP])
+AC_SUBST([GRAS_DEP])
 
 dnl ####[ maint mode ]#######################################################
 AM_MAINTAINER_MODE

diff --git a/examples/ping/Makefile.am b/examples/ping/Makefile.am
index 4058e5a..5feb79d 100644 (file)
--- a/examples/ping/Makefile.am
+++ b/examples/ping/Makefile.am
@@ -9,13 +9,13 @@ EXTRA_DIST=ping_deployment.txt $(TESTS)
 check_PROGRAMS=ping_simulator ping_client ping_server 
 
 ping_simulator_SOURCES=_ping_simulator.c ping.c
-ping_simulator_LDADD=  $(top_builddir)/src/libgrassg.la
+ping_simulator_LDADD=  $(top_builddir)/src/libsimgrid.la
 
 ping_client_SOURCES=   _ping_client.c ping.c
 ping_server_SOURCES=   _ping_server.c ping.c
 
-ping_client_LDADD=     $(top_builddir)/src/libgrasrl.la
-ping_server_LDADD=     $(top_builddir)/src/libgrasrl.la
+ping_client_LDADD=     $(top_builddir)/src/libgras.la
+ping_server_LDADD=     $(top_builddir)/src/libgras.la
 
 # cleanup temps
 MAINTAINERCLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c 

diff --git a/src/Makefile.am b/src/Makefile.am
index fa8fe05..bf8a056 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,7 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0
 #  It modifies the library name, and you thus cannot say that a library
 #   using this trick is ready for a "stable" release (say, in Debian).
 
-lib_LTLIBRARIES= libgrasrl.la libgrassg.la
+lib_LTLIBRARIES= libsimgrid.la libgras.la
 
 COMMON_S=\
   \
@@ -125,14 +125,14 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
 surf/surf_parse.c: surf/surf_parse.l
        @LEX@ -o$@ -Psurf_parse_ $^
 
-libgrasrl_la_SOURCES= $(COMMON_S) \
+libgras_la_SOURCES= $(COMMON_S) \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c      \
   \
   gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
-libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@
 
-libgrassg_la_SOURCES= $(COMMON_S) \
+libsimgrid_la_SOURCES= $(COMMON_S) \
   gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
   \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c
-libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@