socl: move examples from examples/socl to socl/examples

configure.ac

@@ -1460,6 +1460,7 @@ AC_OUTPUT([
 	tools/Makefile
 	socl/Makefile
 	socl/src/Makefile
+	socl/examples/Makefile
 	libstarpu.pc
 	libstarpu1.0.pc
 	libstarpumpi.pc
@@ -1468,7 +1469,6 @@ AC_OUTPUT([
         examples/opt/Makefile
 	examples/starpufft/Makefile
 	examples/stencil/Makefile
-	examples/socl/Makefile
 	examples/starpufft/libstarpufft.pc
 	examples/starpufft/libstarpufft1.0.pc
 	tests/Makefile

examples/Makefile.am

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
-# Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+# Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
 # Copyright (C) 2011  Télécom-SudParis
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -22,10 +22,6 @@ AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS)
 
 SUBDIRS = stencil
 
-if STARPU_USE_SOCL
-SUBDIRS += socl
-endif
-
 if STARPU_HAVE_FFTW
 if STARPU_HAVE_FFTWF
 SUBDIRS += starpufft

socl/Makefile.am

@@ -13,7 +13,7 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-SUBDIRS = src
+SUBDIRS = src examples
 
 EXTRA_DIST = README