Merge changes of maxmin_selective_update branch into the trunk.

[simgrid.git] / examples / Makefile.am

diff --git a/examples/Makefile.am b/examples/Makefile.am
index fabb92ac4b635f11dc37952d422c2eb911558788..80245b975ea2874c6a97cfb317201e0513de449d 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,11 +4,9 @@
 # You can redistribute and/or modify it under the terms of the
 # GNU LGPL (v2.1) licence.
 
-EXTRA_DIST= platforms/prop.xml
+EXTRA_DIST= platforms/prop.xml \
+            platforms/metaxml.xml platforms/metaxml-random.xml
 
-SUBDIRS= msg gras amok simdag 
-if HAVE_JAVA
-  SUBDIRS+= java
-endif
+SUBDIRS= msg gras amok simdag java smpi
 
 include $(top_srcdir)/acmacro/dist-files.mk