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

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

Revision: 676
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=676&view=rev
Author:   hsujohnhsu
Date:     2008-06-06 09:29:06 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
update to makefiles for gazebo plugins and rosgazebo dependencies.

Modified Paths:
--------------
    pkg/trunk/drivers/robot/pr2/libpr2API/Makefile
    pkg/trunk/drivers/robot/pr2/libpr2API/include/libpr2API/pr2API.h
    pkg/trunk/drivers/robot/pr2/libpr2API/manifest.xml
    pkg/trunk/simulators/gazebo_plugin/Makefile
    pkg/trunk/simulators/rosgazebo/manifest.xml
    pkg/trunk/simulators/rosgazebo/rosgazebo.cc

Modified: pkg/trunk/drivers/robot/pr2/libpr2API/Makefile
===================================================================
--- pkg/trunk/drivers/robot/pr2/libpr2API/Makefile	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/drivers/robot/pr2/libpr2API/Makefile	2008-06-06 16:29:06 UTC (rev 676)
@@ -14,10 +14,10 @@
 	$(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)
 
 $(LIBP): pr2API.o
-	ar -rsv $@ $^
+	ar -rv $@ $^
 
-$(LIBS): $(LIBP)
-	$(CXX) -shared -o $@ $^
+$(LIBS): src/pr2API.cpp
+	$(CXX) $(CFLAGS) -shared -o $@ $^ $(LFLAGS)
 
 test_pr2API.o: src/test/test_pr2API.cpp
 	$(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)

Modified: pkg/trunk/drivers/robot/pr2/libpr2API/include/libpr2API/pr2API.h
===================================================================
--- pkg/trunk/drivers/robot/pr2/libpr2API/include/libpr2API/pr2API.h	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/drivers/robot/pr2/libpr2API/include/libpr2API/pr2API.h	2008-06-06 16:29:06 UTC (rev 676)
@@ -33,11 +33,11 @@
 #ifndef PR2_API_HH
 #define PR2_API_HH
 #include <newmat10/newmat.h>
+#include <libKinematics/ik.h>
 #include <pr2Core/pr2Core.h>
 #include <sys/types.h>
 #include <stdint.h>
 #include <string>
-#include <libKinematics/ik.h>
 
 namespace PR2
 {

Modified: pkg/trunk/drivers/robot/pr2/libpr2API/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/pr2/libpr2API/manifest.xml	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/drivers/robot/pr2/libpr2API/manifest.xml	2008-06-06 16:29:06 UTC (rev 676)
@@ -7,12 +7,12 @@
 <author>Sachin Chitta</author>
 <license>BSD</license>
 <url>http://pr.willowgarage.com</url>
-<depend package="newmat10"/>
 <depend package="gazebo"/>
 <depend package="pr2Core"/>
 <depend package="libKinematics"/>
+<depend package="newmat10"/>
 <export>
-<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib"/>
+<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lpr2API"/>
 </export>
 </package>
 

Modified: pkg/trunk/simulators/gazebo_plugin/Makefile
===================================================================
--- pkg/trunk/simulators/gazebo_plugin/Makefile	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/simulators/gazebo_plugin/Makefile	2008-06-06 16:29:06 UTC (rev 676)
@@ -24,11 +24,11 @@
 $(LIB_GRP): libPr2_Gripper.o
 	ar -rs $@ $^
 
-$(LIB_ACT_S): libPr2_Actarray.o
-	g++ -shared -o $@ $^
+$(LIB_ACT_S): src/Pr2_Actarray.cc
+	g++ $(CFLAGS) -shared -o $@ $^ $(LDFLAGS)
 
-$(LIB_GRP_S): libPr2_Gripper.o
-	g++ -shared -o $@ $^
+$(LIB_GRP_S): src/Pr2_Gripper.cc
+	g++ $(CFLAGS) -shared -o $@ $^ $(LDFLAGS)
 
 player_pr2: src/player/Pr2_Player.cc
 	g++ $(CFLAGS) -o $@ $^ $(LDFLAGS)

Modified: pkg/trunk/simulators/rosgazebo/manifest.xml
===================================================================
--- pkg/trunk/simulators/rosgazebo/manifest.xml	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/simulators/rosgazebo/manifest.xml	2008-06-06 16:29:06 UTC (rev 676)
@@ -6,6 +6,7 @@
   <depend package="gazebo" />
   <depend package="gazebo_plugin" />
   <depend package="libpr2API" />
+  <depend package="pr2Core" />
   <depend package="std_msgs" />
   <depend package="rosthread" />
 </package>

Modified: pkg/trunk/simulators/rosgazebo/rosgazebo.cc
===================================================================
--- pkg/trunk/simulators/rosgazebo/rosgazebo.cc	2008-06-06 16:09:29 UTC (rev 675)
+++ pkg/trunk/simulators/rosgazebo/rosgazebo.cc	2008-06-06 16:29:06 UTC (rev 676)
@@ -25,7 +25,7 @@
 // gazebo
 #include <gazebo/gazebo.h>
 #include <gazebo/GazeboError.hh>
-#include "pr2API.hh"
+#include <libpr2API/pr2API.h>
 
 // roscpp
 #include <ros/node.h>


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