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

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

Revision: 4033
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=4033&view=rev
Author:   gerkey
Date:     2008-09-08 16:14:19 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
modified Makefiles for new rospack syntax

Modified Paths:
--------------
    pkg/trunk/3rdparty/estar/Makefile
    pkg/trunk/3rdparty/libsunflower/Makefile
    pkg/trunk/3rdparty/ogre/Makefile
    pkg/trunk/drivers/robot/pr2/pr2Core/Makefile
    pkg/trunk/nav/slam_gmapping/Makefile
    pkg/trunk/simulators/nepumuk/Makefile
    pkg/trunk/util/kinematics/libKinematics/Makefile
    pkg/trunk/visualization/irrlicht_viewer/Makefile
    pkg/trunk/visualization/pr2_gui/Makefile

Modified: pkg/trunk/3rdparty/estar/Makefile
===================================================================
--- pkg/trunk/3rdparty/estar/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/3rdparty/estar/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -23,7 +23,7 @@
 UNPACK_CMD=  tar xfz
 BUILD_DIR=   $(PWD)/build
 INST_DIR=    $(PWD)/local
-BOOST_DIR=   `rospack --cflags-only-I boost`
+BOOST_DIR=   `rospack cflags-only-I boost`
 
 SVN_DIR=     $(PWD)/estar-svn
 SVN_REV=     HEAD

Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================
--- pkg/trunk/3rdparty/libsunflower/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/3rdparty/libsunflower/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -25,7 +25,7 @@
 BUILD_DIR=   $(PWD)/build
 INST_DIR=    $(PWD)/local
 ESTAR_DIR=   `rospack find estar`/local
-BOOST_DIR=   `rospack --cflags-only-I boost`
+BOOST_DIR=   `rospack cflags-only-I boost`
 
 SVN_DIR=     $(PWD)/sunflower-svn
 SVN_REV=     HEAD

Modified: pkg/trunk/3rdparty/ogre/Makefile
===================================================================
--- pkg/trunk/3rdparty/ogre/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/3rdparty/ogre/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -18,17 +18,17 @@
 OISROOT = $(shell rospack find ois)/ois
 CGROOT = $(shell rospack find Cg)/Cg
 
-CFLAGS = $(shell rospack export/cpp/cflags freeimage) \
-         $(shell rospack export/cpp/cflags player) \
-         $(shell rospack export/cpp/cflags opende) \
-         $(shell rospack export/cpp/cflags ois) \
-         $(shell rospack export/cpp/cflags Cg)
+CFLAGS = $(shell rospack --lang=cpp --attrib=cflags export freeimage) \
+         $(shell rospack --lang=cpp --attrib=cflags export player) \
+         $(shell rospack --lang=cpp --attrib=cflags export opende) \
+         $(shell rospack --lang=cpp --attrib=cflags export ois) \
+         $(shell rospack --lang=cpp --attrib=cflags export Cg)
 
-LFLAGS = $(shell rospack export/cpp/lflags freeimage) \
-         $(shell rospack export/cpp/lflags player) \
-         $(shell rospack export/cpp/lflags opende) \
-         $(shell rospack export/cpp/lflags ois) \
-         $(shell rospack export/cpp/lflags Cg)
+LFLAGS = $(shell rospack --lang=cpp --attrib=lflags export freeimage) \
+         $(shell rospack --lang=cpp --attrib=lflags export player) \
+         $(shell rospack --lang=cpp --attrib=lflags export opende) \
+         $(shell rospack --lang=cpp --attrib=lflags export ois) \
+         $(shell rospack --lang=cpp --attrib=lflags export Cg)
 
 CONFIGURE_FLAGS = --with-arch=nocona --enable-release CXXFLAGS='-O3 -I$(FIROOT)/include -I$(OISROOT)/include -I$(CGROOT)/include' LDFLAGS='-Wl,-rpath,$(FIROOT)/lib,-rpath,$(OISROOT)/lib,-rpath,$(CGROOT)/lib -L$(FIROOT)/lib -L$(OISROOT)/lib -L$(CGROOT)/lib' CFLAGS='-O3 -I$(FIROOT)/include -I$(OISROOT)/include -I$(CGROOT)/include'
 

Modified: pkg/trunk/drivers/robot/pr2/pr2Core/Makefile
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2Core/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/drivers/robot/pr2/pr2Core/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -1,8 +1,8 @@
 PKG = pr2Core
 
-CFLAGS = -g -Wall -Iinclude `rospack export/cpp/cflags $(PKG)`
+CFLAGS = -g -Wall -Iinclude `rospack --lang=cpp --attrib=cflags export $(PKG)`
 
-LDFLAGS = `rospack export/cpp/lflags $(PKG)`
+LDFLAGS = `rospack --lang=cpp --attrib=lflags export $(PKG)`
 
 LIB = 
 

Modified: pkg/trunk/nav/slam_gmapping/Makefile
===================================================================
--- pkg/trunk/nav/slam_gmapping/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/nav/slam_gmapping/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -2,8 +2,8 @@
 CXX = g++
 all: $(PKG)
 
-CFLAGS = -O3 -Wall `rospack export/cpp/cflags $(PKG)`
-LFLAGS = `rospack export/cpp/lflags $(PKG)`
+CFLAGS = -O3 -Wall `rospack --lang=cpp --attrib=cflags export $(PKG)`
+LFLAGS = `rospack --lang=cpp --attrib=lflags export $(PKG)`
 
 slam_gmapping: slam_gmapping.cc
 	$(CXX) $(CFLAGS) -o $@ $< $(LFLAGS)

Modified: pkg/trunk/simulators/nepumuk/Makefile
===================================================================
--- pkg/trunk/simulators/nepumuk/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/simulators/nepumuk/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -29,7 +29,7 @@
 INST_DIR=    $(PWD)/local
 ESTAR_DIR=   `rospack find estar`/local
 SFL_DIR=     `rospack find libsunflower`/local
-BOOST_DIR=   `rospack --cflags-only-I boost`
+BOOST_DIR=   `rospack cflags-only-I boost`
 
 SVN_DIR=     $(PWD)/nepumuk-svn
 SVN_REV=     HEAD

Modified: pkg/trunk/util/kinematics/libKinematics/Makefile
===================================================================
--- pkg/trunk/util/kinematics/libKinematics/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/util/kinematics/libKinematics/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -1,10 +1,10 @@
 PKG = libKinematics
 
-CFLAGS = -g -Wall -Iinclude $(shell rospack export/cpp/cflags $(PKG))
+CFLAGS = -g -Wall -Iinclude $(shell rospack --lang=cpp --attrib=cflags export $(PKG))
 
-LDFLAGS = $(shell rospack export/cpp/lflags newmat10)
+LDFLAGS = $(shell rospack --lang=cpp --attrib=lflags export newmat10)
 
-LFLAGS  = $(shell rospack export/cpp/lflags $(PKG))
+LFLAGS  = $(shell rospack --lang=cpp --attrib=lflags export $(PKG))
 
 LIBK  = lib/libKinematics.a
 LIBIK = lib/libIk.a

Modified: pkg/trunk/visualization/irrlicht_viewer/Makefile
===================================================================
--- pkg/trunk/visualization/irrlicht_viewer/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/visualization/irrlicht_viewer/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -12,8 +12,8 @@
 
 
 
-CPPFLAGS = $(shell rospack export/cpp/cflags irrlicht_viewer)
-LDFLAGS =  $(shell rospack export/cpp/lflags irrlicht_viewer)
+CPPFLAGS = $(shell rospack --lang=cpp --attrib=cflags export irrlicht_viewer)
+LDFLAGS =  $(shell rospack --lang=cpp --attrib=lflags export irrlicht_viewer)
 
 CUSTOM_NODES = $(shell ls CustomNodes/*.cc)
 
@@ -49,4 +49,4 @@
 
 
 clouder: cloudGenerator.cc $(ILRENDER_LIB) 
-	$(CPP) $(CPPFLAGS) -o $@ $^  $(LDFLAGS)
\ No newline at end of file
+	$(CPP) $(CPPFLAGS) -o $@ $^  $(LDFLAGS)

Modified: pkg/trunk/visualization/pr2_gui/Makefile
===================================================================
--- pkg/trunk/visualization/pr2_gui/Makefile	2008-09-08 06:39:34 UTC (rev 4032)
+++ pkg/trunk/visualization/pr2_gui/Makefile	2008-09-08 16:14:19 UTC (rev 4033)
@@ -2,8 +2,8 @@
 OUT = bin/pr2_gui
 PKG = pr2_gui
 
-CFLAGS = -g `wx-config --cxxflags` $(shell rospack export/cpp/cflags pr2_gui)
-LFLAGS = `wx-config --libs` $(shell rospack export/cpp/lflags pr2_gui)
+CFLAGS = -g `wx-config --cxxflags` $(shell rospack --lang=cpp --attrib=cflags export pr2_gui)
+LFLAGS = `wx-config --libs` $(shell rospack --lang=cpp --attrib=lflags export pr2_gui)
 
 all:	$(SRC)
 		g++ $(SRC) $(CFLAGS) $(LFLAGS) -o $(OUT)


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