[TeamTalk 86]: [623] moast-bth: Makefile path modifications to support change in directory structure.

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070521/27ddeb32/attachment.html
-------------- next part --------------
Modified: moast-bth/TeamTalkSimulator/Makefile
===================================================================
--- moast-bth/TeamTalkSimulator/Makefile	2007-05-21 12:49:04 UTC (rev 622)
+++ moast-bth/TeamTalkSimulator/Makefile	2007-05-21 13:19:00 UTC (rev 623)
@@ -1,5 +1,4 @@
-MOASTLIB_DIR = $(CARTOON_HOME)/moast/devel
-RCSLIB_DIR = $(CARTOON_HOME)/lib/rcslib
+MOASTLIB_DIR = ../moast
 BOEINGLIB_DIR = ../boeingLib
 PRIMITIVECOMM_DIR = ../PrimitiveComm
 
@@ -63,6 +62,6 @@
 # Clean rule
 clean:
 	$(MAKE) -C $(PRIMITIVECOMM_DIR) clean
-	rm -f *.o $(EXECUTABLES)
+	rm -f *.o *.d $(EXECUTABLES)
 
 force: ;
\ No newline at end of file

Modified: moast-bth/moast/bin/Makefile.am
===================================================================
--- moast-bth/moast/bin/Makefile.am	2007-05-21 12:49:04 UTC (rev 622)
+++ moast-bth/moast/bin/Makefile.am	2007-05-21 13:19:00 UTC (rev 623)
@@ -154,8 +154,8 @@
 sectShell_SOURCES = ../src/section/sectShell.cc
 sectShell_LDADD = ../lib/libmoast.a -L$(RCSLIB_DIR)/lib -lrcs -lposemath -lm
 
-sectMobPL_SOURCES = ../src/section/sectMobPL.cc ../src/section/rcsSectMobPlEngine.cc ../src/section/rcsSectMobPlEngine.hh ../../../TeamTalk/Agents/boeingLib/boeing/boeing_map_server.cc ../../../TeamTalk/Agents/boeingLib/boeing/boeing_map_server.h ../../../TeamTalk/Agents/boeingLib/boeing/boeing_map_packet.cc ../../../TeamTalk/Agents/boeingLib/boeing/boeing_map_packet.h ../../../TeamTalk/Agents/boeingLib/coralshared/timer.cc ../../../TeamTalk/Agents/boeingLib/coralshared/timer.h ../../../TeamTalk/Agents/boeingLib/coralshared/udpsocket.cc ../../../TeamTalk/Agents/boeingLib/coralshared/udpsocket.h ../../../TeamTalk/Agents/boeingLib/coralshared/error_check.cc ../../../TeamTalk/Agents/boeingLib/coralshared/error_check.h
-sectMobPL_CPPFLAGS = -I../../../TeamTalk/Agents/boeingLib/boeing -I../../../TeamTalk/Agents/boeingLib/coralshared
+sectMobPL_SOURCES = ../src/section/sectMobPL.cc ../src/section/rcsSectMobPlEngine.cc ../src/section/rcsSectMobPlEngine.hh ../../boeingLib/boeing/boeing_map_server.cc ../../boeingLib/boeing/boeing_map_server.h ../../boeingLib/boeing/boeing_map_packet.cc ../../boeingLib/boeing/boeing_map_packet.h ../../boeingLib/coralshared/timer.cc ../../boeingLib/coralshared/timer.h ../../boeingLib/coralshared/udpsocket.cc ../../boeingLib/coralshared/udpsocket.h ../../boeingLib/coralshared/error_check.cc ../../boeingLib/coralshared/error_check.h
+sectMobPL_CPPFLAGS = -I../../boeingLib/boeing -I../../boeingLib/coralshared
 sectMobPL_LDADD = ../lib/libmoast.a -L$(RCSLIB_DIR)/lib -lrcs -lposemath -lm
 
 trafficShell_SOURCES = ../src/sim/simWare/trafficShell.cc