[Personalrobots-commit] SF.net SVN: personalrobots: [608] pkg/trunk

[<hsu...@us...>]

Revision: 608
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=608&view=rev
Author:   hsujohnhsu
Date:     2008-06-03 12:48:17 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
fix rosmake settings for rosgazebo.

Modified Paths:
--------------
    pkg/trunk/3rdparty/gazebo/manifest.xml
    pkg/trunk/simulators/rosgazebo/Makefile
    pkg/trunk/simulators/rosgazebo/manifest.xml

Modified: pkg/trunk/3rdparty/gazebo/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/gazebo/manifest.xml	2008-06-03 18:56:39 UTC (rev 607)
+++ pkg/trunk/3rdparty/gazebo/manifest.xml	2008-06-03 19:48:17 UTC (rev 608)
@@ -12,7 +12,7 @@
 <license>GPL</license>
 <url>http://playerstage.sf.net</url>
 <export>
-  <!--<cpp lflags="-Xlinker -rpath ${prefix}/player/lib -L${prefix}/player/lib -lplayercore -lplayerxdr -lplayerutils -lplayererror" cflags="-I${prefix}/player/include/player-2.2"/> -->
+  <cpp lflags="-Wl,-rpath,${prefix}/gazebo-git/root/lib `PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --libs libgazebo` `PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --libs libgazeboServer` `PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --libs libpr2API`" cflags="`PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --cflags libgazebo` `PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --cflags libgazeboServer` `PKG_CONFIG_PATH=${prefix}/gazebo-git/root/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --cflags libpr2API`"/>
   <doxymaker external="http://playerstage.sourceforge.net/doc/Gazebo-manual-svn-html/"/>
 </export>
 </package>

Modified: pkg/trunk/simulators/rosgazebo/Makefile
===================================================================
--- pkg/trunk/simulators/rosgazebo/Makefile	2008-06-03 18:56:39 UTC (rev 607)
+++ pkg/trunk/simulators/rosgazebo/Makefile	2008-06-03 19:48:17 UTC (rev 608)
@@ -4,9 +4,11 @@
 CXX = g++
 all: $(PKG)
 
-CFLAGS = -g -Wall $(shell rospack export/cpp/cflags $(PKG)) $(shell pkg-config --cflags libpr2API) $(shell pkg-config --cflags libgazebo) $(shell pkg-config --cflags libgazeboServer)
-LFLAGS = $(shell rospack export/cpp/lflags $(PKG)) $(shell pkg-config --libs libpr2API) $(shell pkg-config --libs libgazebo) $(shell pkg-config --libs libgazeboServer)
 
+CFLAGS = -g -Wall $(shell rospack export/cpp/cflags $(PKG))
+
+LFLAGS = $(shell rospack export/cpp/lflags $(PKG))
+
 rosgazebo: rosgazebo.cc
 	$(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)
 

Modified: pkg/trunk/simulators/rosgazebo/manifest.xml
===================================================================
--- pkg/trunk/simulators/rosgazebo/manifest.xml	2008-06-03 18:56:39 UTC (rev 607)
+++ pkg/trunk/simulators/rosgazebo/manifest.xml	2008-06-03 19:48:17 UTC (rev 608)
@@ -3,6 +3,7 @@
   <author>John M. Hsu</author>
   <license>TBD</license>
   <depend package="roscpp" />
+  <depend package="gazebo" />
   <depend package="std_msgs" />
   <depend package="rosthread" />
 </package>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.