Change variable waiting_task to waiting_action on msg process control.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 64391ec..3a8081a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ EXTRA_DIST= \
        portable.h \
        \
         xbt/mallocator_private.h \
-       xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
@@ -47,6 +46,7 @@ EXTRA_DIST= \
        surf/gtnets/gtnets_interface.h \
        surf/gtnets/gtnets_simulator.h \
        surf/gtnets/gtnets_topology.h  \
+       surf/cpu_ti_private.h \
        \
         include/surf/surf_resource.h  \
        include/surf/datatypes.h \
@@ -184,6 +184,8 @@ SURF_SRC= \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
+  surf/cpu_ti.c                                               \
+  surf/cpu_im.c                                               \
   xbt/xbt_sg_stubs.c
 
 if CONTEXT_THREADS
@@ -357,7 +359,7 @@ if HAVE_JAVA
 libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 
 clean-local:
-       -rm -rf .classes
+       -rm -rf .classes simgrid.jar
 
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
@@ -369,7 +371,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
        cp $(srcdir)/surf/simgrid.dtd .classes/surf
        $(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
 if GRAMINE_MODE