From ac5e65778a9aff98c941077e3625c1733c321cff Mon Sep 17 00:00:00 2001 From: Anthony Mallet <anthony.mallet@laas.fr> Date: Mon, 23 Jan 2012 16:15:21 +0100 Subject: [PATCH] [wip/stackoftasks] Finish removing stackoftask (fix 6f2c7f54) - Delete stackoftasks from toplevel SUBDIR - Comment out an include of delete stackoftasks file in wip/sot-gui. Should wip/sot-gui be removed too? --- Makefile | 1 - sot-gui/Makefile | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6647c09e..33a64ca2 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,6 @@ SUBDIR+= robotModelParser-libs SUBDIR+= robot-viewer SUBDIR+= sot-gui SUBDIR+= spark-genom -SUBDIR+= stackoftasks SUBDIR+= visp include ../mk/robotpkg.subdir.mk diff --git a/sot-gui/Makefile b/sot-gui/Makefile index b457f1e8..544291b4 100644 --- a/sot-gui/Makefile +++ b/sot-gui/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2010 LAAS/CNRS +# Copyright (c) 2010,2012 LAAS/CNRS # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,7 +33,9 @@ NO_CONFIGURE= yes # include ../robot-viewer/depend.mk -include ../stackoftasks/depend.mk + +# The following package was deleted in 6f2c7f54. Delete this package too?? +# include ../stackoftasks/depend.mk include ../../mk/robotpkg.mk -- GitLab